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

Commit 4931c36c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add and enable the debug clock controller on SDM845" into msm-4.9

parents 0368db94 98bdd50b

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

+18 −5
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ 
	};



	clock_gcc: qcom,gcc@100000 {

		compatible = "qcom,gcc-sdm845";

		compatible = "qcom,gcc-sdm845", "syscon";

		reg = <0x100000 0x1f0000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&pm8998_s9_level>;
@@ -717,7 +717,7 @@ 
	};



	clock_videocc: qcom,videocc@ab00000 {

		compatible = "qcom,video_cc-sdm845";

		compatible = "qcom,video_cc-sdm845", "syscon";

		reg = <0xab00000 0x10000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&pm8998_s9_level>;
@@ -726,7 +726,7 @@ 
	};



	clock_camcc: qcom,camcc@ad00000 {

		compatible = "qcom,cam_cc-sdm845";

		compatible = "qcom,cam_cc-sdm845", "syscon";

		reg = <0xad00000 0x10000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&pm8998_s9_level>;
@@ -736,7 +736,7 @@ 
	};



	clock_dispcc: qcom,dispcc@af00000 {

		compatible = "qcom,dispcc-sdm845";

		compatible = "qcom,dispcc-sdm845", "syscon";

		reg = <0xaf00000 0x100000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&pm8998_s9_level>;
@@ -745,7 +745,7 @@ 
	};



	clock_gpucc: qcom,gpucc@5090000 {

		compatible = "qcom,gpucc-sdm845";

		compatible = "qcom,gpucc-sdm845", "syscon";

		reg = <0x5090000 0x9000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&pm8998_s9_level>;
@@ -887,6 +887,19 @@ 
		mbox-names = "apps";

	};



	clock_debug: qcom,cc-debug@100000 {

		compatible = "qcom,debugcc-sdm845";

		qcom,cc-count = <5>;

		qcom,gcc = <&clock_gcc>;

		qcom,videocc = <&clock_videocc>;

		qcom,camcc = <&clock_camcc>;

		qcom,dispcc = <&clock_dispcc>;

		qcom,gpucc = <&clock_gpucc>;

		clock-names = "xo_clk_src";

		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		#clock-cells = <1>;

	};



	ufsphy_mem: ufsphy_mem@1d87000 {

		reg = <0x1d87000 0xda8>; /* PHY regs */

		reg-names = "phy_mem";