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

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

Merge "ARM: dts: msm: update clock_rpmh device node for Lahaina"

parents c023615f a1ba89b2
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ other hardware subsystems via RSC to control clocks.

Required properties :
- compatible : Shall contain one of the following:
		"qcom,lahaina-rpmh-clk"
		"qcom,kona-rpmh-clk",
		"qcom,sdm845-rpmh-clk"

@@ -29,3 +30,10 @@ Example :
			#clock-cells = <1>;
		};
	};

	&apps_rsc {
		rpmhcc: clock-controller {
			compatible = "qcom,lahaina-rpmh-clk";
			#clock-cells = <1>;
		};
	};
+5 −24
Original line number Diff line number Diff line
@@ -536,30 +536,6 @@
		};
	};

	cxo: bi_tcxo {
		compatible = "fixed-factor-clock";
		clocks = <&xo_board>;
		clock-mult = <1>;
		clock-div = <2>;
		#clock-cells = <0>;
		clock-output-names = "bi_tcxo";
	};

	cxo_a: bi_tcxo_ao {
		compatible = "fixed-factor-clock";
		clocks = <&xo_board>;
		clock-mult = <1>;
		clock-div = <2>;
		#clock-cells = <0>;
		clock-output-names = "bi_tcxo_ao";
	};

	clock_rpmh: qcom,rpmhclk {
		compatible = "qcom,dummycc";
		clock-output-names = "rpmh_clocks";
		#clock-cells = <1>;
	};

	clock_aop: qcom,aopclk {
		compatible = "qcom,aop-qmp-clk";
		#clock-cells = <1>;
@@ -1139,6 +1115,11 @@
		system_pm {
			compatible = "qcom,system-pm";
		};

		clock_rpmh: qcom,rpmhclk {
			compatible = "qcom,lahaina-rpmh-clk";
			#clock-cells = <1>;
		};
	};

	disp_rsc: rsc@af20000 {