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

Commit 6432b72e 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: Register rpmh clocks before clock gcc" into msm-4.9

parents 2af86203 9b42110e

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

+7 −7
Original line number Diff line number Diff line
@@ -821,6 +821,13 @@ 
		interrupts = <1 5 4>;

	};



	clock_rpmh: qcom,rpmhclk {

		compatible = "qcom,rpmh-clk-sdm845";

		#clock-cells = <1>;

		mboxes = <&apps_rsc 0>;

		mbox-names = "apps";

	};



	clock_gcc: qcom,gcc@100000 {

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

		reg = <0x100000 0x1f0000>;
@@ -995,13 +1002,6 @@ 
		#reset-cells = <1>;

	};



	clock_rpmh: qcom,rpmhclk {

		compatible = "qcom,rpmh-clk-sdm845";

		#clock-cells = <1>;

		mboxes = <&apps_rsc 0>;

		mbox-names = "apps";

	};



	clock_debug: qcom,cc-debug@100000 {

		compatible = "qcom,debugcc-sdm845";

		qcom,cc-count = <5>;