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

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

Merge "ARM: dts: msm: Add all clock controller and gdsc nodes for scshrike"

parents ffec9378 a076a286
Loading
Loading
Loading
Loading

qcom/sa8195-gdsc.dtsi

0 → 100644
+47 −0
Original line number Diff line number Diff line
#include "sm8150-gdsc.dtsi"

&soc {
	/* GDSCs in Global CC */
	pcie_2_gdsc: qcom,gdsc@19d004 {
		compatible = "qcom,gdsc";
		reg = <0x19d004 0x4>;
		regulator-name = "pcie_2_gdsc";
		status = "disabled";
	};

	pcie_3_gdsc: qcom,gdsc@1a3004 {
		compatible = "qcom,gdsc";
		reg = <0x1a3004 0x4>;
		regulator-name = "pcie_3_gdsc";
		status = "disabled";
	};

	ufs_card_2_gdsc: qcom,gdsc@1a2004 {
		compatible = "qcom,gdsc";
		reg = <0x1a2004 0x4>;
		regulator-name = "ufs_card_2_gdsc";
		status = "disabled";
	};

	usb30_mp_gdsc: qcom,gdsc@1a6004 {
		compatible = "qcom,gdsc";
		reg = <0x1a6004 0x4>;
		regulator-name = "usb30_mp_gdsc";
		status = "disabled";
	};

	/* GDSCs in Camera CC */
	ife_2_gdsc: qcom,gdsc@ad0f004 {
		compatible = "qcom,gdsc";
		reg = <0xad0f004 0x4>;
		regulator-name = "ife_2_gdsc";
		status = "disabled";
	};

	ife_3_gdsc: qcom,gdsc@ad0f070 {
		compatible = "qcom,gdsc";
		reg = <0xad0f070 0x4>;
		regulator-name = "ife_3_gdsc";
		status = "disabled";
	};
};
+9 −0
Original line number Diff line number Diff line
@@ -59,4 +59,13 @@
	/delete-node/ refgen;
};

&camcc {
	vdd_mx-supply = <&VDD_MX_LEVEL>;
	vdd_mm-supply = <&VDD_MMCX_LEVEL>;
};

&gpu_gx_gdsc {
	parent-supply = <&VDD_MMCX_LEVEL>;
};

#include "sa8195p-regulator.dtsi"

qcom/sa8195-smp2p.dtsi

0 → 100644
+84 −0
Original line number Diff line number Diff line
#include <dt-bindings/interrupt-controller/arm-gic.h>

&soc {

	qcom,smp2p-modem {
		compatible = "qcom,smp2p";
		qcom,smem = <435>, <428>;
		interrupts = <GIC_SPI 451 IRQ_TYPE_EDGE_RISING>;
		qcom,ipc = <&apcs 0 14>;
		qcom,local-pid = <0>;
		qcom,remote-pid = <1>;

		modem_smp2p_out: master-kernel {
			qcom,entry-name = "master-kernel";
			#qcom,smem-state-cells = <1>;
		};

		modem_smp2p_in: slave-kernel {
			qcom,entry-name = "slave-kernel";
			interrupt-controller;
			#interrupt-cells = <2>;
		};
	};

	qcom,smp2p-adsp {
		compatible = "qcom,smp2p";
		qcom,smem = <443>, <429>;
		interrupts = <GIC_SPI 158 IRQ_TYPE_EDGE_RISING>;
		qcom,ipc = <&apcs 0 10>;
		qcom,local-pid = <0>;
		qcom,remote-pid = <2>;

		adsp_smp2p_out: master-kernel {
			qcom,entry-name = "master-kernel";
			#qcom,smem-state-cells = <1>;
		};

		adsp_smp2p_in: slave-kernel {
			qcom,entry-name = "slave-kernel";
			interrupt-controller;
			#interrupt-cells = <2>;
		};
	};

	qcom,smp2p-dsps {
		compatible = "qcom,smp2p";
		qcom,smem = <481>, <430>;
		interrupts = <GIC_SPI 172 IRQ_TYPE_EDGE_RISING>;
		qcom,ipc = <&apcs 0 26>;
		qcom,local-pid = <0>;
		qcom,remote-pid = <3>;

		dsps_smp2p_out: master-kernel {
			qcom,entry-name = "master-kernel";
			#qcom,smem-state-cells = <1>;
		};

		dsps_smp2p_in: slave-kernel {
			qcom,entry-name = "slave-kernel";
			interrupt-controller;
			#interrupt-cells = <2>;
		};
	};

	qcom,smp2p-cdsp {
		compatible = "qcom,smp2p";
		qcom,smem = <94>, <432>;
		interrupts = <GIC_SPI 576 IRQ_TYPE_EDGE_RISING>;
		qcom,ipc = <&apcs 0 6>;
		qcom,local-pid = <0>;
		qcom,remote-pid = <5>;

		cdsp_smp2p_out: master-kernel {
			qcom,entry-name = "master-kernel";
			#qcom,smem-state-cells = <1>;
		};

		cdsp_smp2p_in: slave-kernel {
			qcom,entry-name = "slave-kernel";
			interrupt-controller;
			#interrupt-cells = <2>;
		};
	};
};
+4 −0
Original line number Diff line number Diff line
@@ -7,3 +7,7 @@
	qcom,msm-id = <405 0x20000>;
};

&scc {
	vdd_scc_cx-supply = <&VDD_SCC_CX_LEVEL>;
	status = "ok";
};
+25 −0
Original line number Diff line number Diff line
@@ -6,3 +6,28 @@
	qcom,msm-id = <340 0x20000>;
};

/delete-node/ &ufs_card_gdsc;

&camcc {
	compatible = "qcom,scshrike-camcc-v2", "syscon";
};

&dispcc {
	compatible = "qcom,scshrike-dispcc-v2", "syscon";
};

&gcc {
	compatible = "qcom,scshrike-gcc-v2", "syscon";
};

&npucc {
	compatible = "qcom,sm8150-npucc-v2", "syscon";
};

&scc {
	compatible = "qcom,sa8195-scc-v2", "syscon";
};

&videocc {
	compatible = "qcom,sm8150-videocc-v2", "syscon";
};
Loading