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

Commit 415e8794 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add the debug clock node for SDXPRAIRIE"

parents 0d1e2cec a175111b
Loading
Loading
Loading
Loading
+17 −16
Original line number Diff line number Diff line
@@ -40,25 +40,26 @@
				     0x10060 0x3c
				     0x0 0x4>;
	};
};

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

	clock_aop: qcom,aop {
&clock_aop {
	compatible = "qcom,dummycc";
	clock-output-names = "aop_clocks";
		#clock-cells = <1>;
};

	clock_gcc: qcom,gcc {
&clock_gcc {
	compatible = "qcom,dummycc";
	clock-output-names = "gcc_clocks";
		#clock-cells = <1>;
		#reset-cells = <1>;
};

&clock_debugcc {
	compatible = "qcom,dummycc";
	clock-output-names = "dummy_clocks";
};

&ipa_hw {
+24 −7
Original line number Diff line number Diff line
@@ -209,24 +209,41 @@
	};

	clock_rpmh: qcom,rpmh {
		compatible = "qcom,dummycc";
		clock-output-names = "rpmh_clocks";
		compatible = "qcom,rpmh-clk-sdxprairie";
		mboxes = <&apps_rsc 0>;
		mbox-names = "apps";
		#clock-cells = <1>;
	};

	clock_aop: qcom,aop {
		compatible = "qcom,dummycc";
		clock-output-names = "aop_clocks";
		compatible = "qcom,aop-qmp-clk";
		mboxes = <&qmp_aop 0>;
		mbox-names = "qdss_clk";
		#clock-cells = <1>;
	};

	clock_gcc: qcom,gcc {
		compatible = "qcom,dummycc";
		clock-output-names = "gcc_clocks";
	clock_gcc: qcom,gcc@100000 {
		compatible = "qcom,gcc-sdxprairie", "syscon";
		reg = <0x100000 0x1f0000>;
		reg-names = "cc_base";
		clocks = <&clock_rpmh RPMH_CXO_CLK>;
		clock-names = "bi_tcxo";
		vdd_cx-supply = <&VDD_CX_LEVEL>;
		vdd_cx_ao-supply = <&VDD_CX_LEVEL_AO>;
		vdd_mx-supply = <&VDD_MX_LEVEL>;
		#clock-cells = <1>;
		#reset-cells = <1>;
	};

	clock_debugcc: qcom,cc-debug {
		compatible = "qcom,debugcc-sdxprairie";
		qcom,cc-count = <1>;
		qcom,gcc = <&clock_gcc>;
		clock-names = "xo_clk_src";
		clocks = <&clock_rpmh RPMH_CXO_CLK>;
		#clock-cells = <1>;
	};

	serial_uart: serial@831000 {
		compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
		reg = <0x831000 0x200>;