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

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

Merge "ARM: dts: msm: Update the RPMHCC node for SHIMA"

parents 57177725 52a08e91

qcom/shima-rumi.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -25,6 +25,22 @@ 
				     0x10060 0x3c

				     0x0 0x4>;

	};



	bi_tcxo: bi_tcxo {

		compatible = "fixed-factor-clock";

		clock-mult = <1>;

		clock-div = <2>;

		clocks = <&xo_board>;

		#clock-cells = <0>;

	};



	bi_tcxo_ao: bi_tcxo_ao {

		compatible = "fixed-factor-clock";

		clock-mult = <1>;

		clock-div = <2>;

		clocks = <&xo_board>;

		#clock-cells = <0>;

	};

};



&usb0 {
@@ -34,3 +50,8 @@ 
		dr_mode = "peripheral";

	};

};



&rpmhcc {

	compatible = "qcom,dummycc";

	clock-output-names = "rpmhcc_clocks";

};

qcom/shima.dtsi

+5 −23
Original line number Diff line number Diff line
@@ -529,22 +529,6 @@ 
		};

	};



	bi_tcxo: bi_tcxo {

		compatible = "fixed-factor-clock";

		clock-mult = <1>;

		clock-div = <2>;

		clocks = <&xo_board>;

		#clock-cells = <0>;

	};



	bi_tcxo_ao: bi_tcxo_ao {

		compatible = "fixed-factor-clock";

		clock-mult = <1>;

		clock-div = <2>;

		clocks = <&xo_board>;

		#clock-cells = <0>;

	};



	aopcc: qcom,aopcc {

		compatible = "qcom,dummycc";

		clock-output-names = "aopcc_clocks";
@@ -552,13 +536,6 @@ 
		#reset-cells = <1>;

	};



	rpmhcc: qcom,rpmhcc {

		compatible = "qcom,dummycc";

		clock-output-names = "rpmhcc_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	gcc: qcom,gcc@100000 {

		compatible = "qcom,dummycc";

		clock-output-names = "gcc_clocks";
@@ -880,6 +857,11 @@ 
				  <SLEEP_TCS   3>,

				  <WAKE_TCS    3>,

				  <CONTROL_TCS 1>;



		rpmhcc: qcom,rpmhclk {

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

			#clock-cells = <1>;

		};

	};



	disp_rsc: rsc@af20000 {