Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dd649fe authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add npubw and fix ipc irq for atoll"

parents 49eb4aa0 1f139b5a

arch/arm64/boot/dts/qcom/atoll-npu.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
		reg-names = "tcm", "core", "cc", "apss_shared";

		interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 585 IRQ_TYPE_EDGE_RISING>,

			<GIC_SPI 587 IRQ_TYPE_EDGE_RISING>,

			<GIC_SPI 588 IRQ_TYPE_EDGE_RISING>,

			<GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error_irq", "wdg_bite_irq", "ipc_irq",

			"general_irq";
@@ -60,6 +60,8 @@ 
		qcom,proxy-reg-names ="vdd", "vdd_cx";

		qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;

		#cooling-cells = <2>;

		qcom,npubw-devs = <&npu_npu_ddr_bw>, <&npudsp_npu_ddr_bw>;

		qcom,npubw-dev-names = "ddr_bw", "dsp_ddr_bw";

		qcom,src-dst-ports = <MSM_BUS_MASTER_NPU MSM_BUS_SLAVE_EBI_CH0>;

		qcom,npu-pwrlevels {

			#address-cells = <1>;

arch/arm64/boot/dts/qcom/atoll.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ 


		/* Outputs to npu */

		qcom,smem-states = <&npu_smp2p_out 0>;

		qcom,smem-states-names = "qcom,force-stop";

		qcom,smem-state-names = "qcom,force-stop";

	};



	qcom,turing@8300000 {