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

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

Merge "ARM: dts: msm: Enable NPU support for LAGOON"

parents b232e513 f0119c77

qcom/lagoon-npu.dtsi

+19 −5
Original line number Diff line number Diff line
@@ -6,14 +6,18 @@ 
			<0x99F0000 0x10000>,

			<0x9980000 0x10000>,

			<0x17c00000 0x10000>,

			<0x01F40000 0x40000>;

		reg-names = "tcm", "core", "cc", "apss_shared", "tcsr";

			<0x01F40000 0x40000>,

			<0x780000 0x7000>;

		reg-names = "tcm", "core", "cc", "apss_shared", "tcsr",

				"qfprom_physical";

		interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 585 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 587 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;

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

					"general_irq";

		iommus = <&apps_smmu 0x1461 0x00>, <&apps_smmu 0x1462 0x00>,

				<&apps_smmu 0x1481 0x00>, <&apps_smmu 0x1482 0x00>;



		clocks = <&npucc NPU_CC_XO_CLK>,

				<&npucc NPU_CC_CORE_CLK>,
@@ -46,6 +50,16 @@ 
		vdd_cx-supply = <&VDD_CX_LEVEL>;

		qcom,proxy-reg-names ="vdd", "vdd_cx";

		#cooling-cells = <2>;

		mboxes = <&ipcc_mproc IPCC_CLIENT_NPU

				IPCC_MPROC_SIGNAL_GLINK_QMP>,

			<&ipcc_mproc IPCC_CLIENT_NPU

				IPCC_MPROC_SIGNAL_SMP2P>,

			<&ipcc_mproc IPCC_CLIENT_NPU

				IPCC_MPROC_SIGNAL_PING>;

		mbox-names = "ipcc-glink", "ipcc-smp2p", "ipcc-ping";

		#mbox-cells = <2>;

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

				<MSM_BUS_MASTER_NPU MSM_BUS_SLAVE_CLK_CTL>;

		qcom,npu-pwrlevels {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -56,7 +70,7 @@ 
				vreg = <1>;

				clk-freq = <19200000

					100000000

					200000000

					268000000

					268000000

					150000000

					30000000
@@ -74,7 +88,7 @@ 
				vreg = <2>;

				clk-freq = <19200000

					200000000

					400000000

					403000000

					403000000

					200000000

					37500000
@@ -128,7 +142,7 @@ 
				vreg = <6>;

				clk-freq = <19200000

					500000000

					800000000

					850000000

					850000000

					533000000

					75000000

qcom/lagoon.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -2045,7 +2045,7 @@ 
		glink_npu: npu {

			qcom,remote-pid = <10>;

			transport = "smem";

			mboxes = <&ipcc_mproc IPCC_CLIENT_NPU

			mboxes = <&msm_npu IPCC_CLIENT_NPU

				  IPCC_MPROC_SIGNAL_GLINK_QMP>;

			mbox-names = "npu_smem";

			interrupt-parent = <&ipcc_mproc>;