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

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

Merge "ARM: dts: msm: Update device node for RPMCC for scuba"

parents 972c26df 4192c1d7

bindings/clock/qcom,rpmcc.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties : 
			"qcom,rpmcc-apq8064", "qcom,rpmcc"

			"qcom,rpmcc-msm8996", "qcom,rpmcc"

			"qcom,rpmcc-bengal", "qcom,rpmcc"

			"qcom,rpmcc-scuba", "qcom,rpmcc"



- #clock-cells : shall contain 1

qcom/scuba-rumi.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -27,6 +27,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 {
@@ -82,3 +98,10 @@ 


	status = "ok";

};



&rpmcc {

	compatible = "qcom,dummycc";

	clock-output-names = "rpmcc_clocks";

	#clock-cells = <1>;

	#reset-cells = <1>;

};

qcom/scuba.dtsi

+1 −19
Original line number Diff line number Diff line
@@ -835,29 +835,11 @@ 
			clock-output-names = "chip_sleep_clk";

			#clock-cells = <0>;

		};



		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>;

		};

	};



	rpmcc: qcom,rpmcc {

		compatible = "qcom,dummycc";

		clock-output-names = "rpmcc_clocks";

		compatible = "qcom,rpmcc-scuba";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	qcom,rmtfs_sharedmem@0 {