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

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

Merge "ARM: dts: msm: Add support for clock controllers for BLAIR"

parents 39d72833 2e55bc6b

qcom/blair-rumi.dtsi

+0 −30
Original line number Diff line number Diff line 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/qcom,gcc-blair.h>

&soc {

	timer {

		clock-frequency = <500000>;
@@ -27,22 +26,6 @@ 
				     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>;

	};

};



&tsens0 {
@@ -142,15 +125,6 @@ 
	rpm-standalone;

};



&rpmcc {

	compatible = "qcom,dummycc";

	clock-output-names = "rpmhcc_clocks";

};



&gcc {

	clocks = <&bi_tcxo>, <&bi_tcxo_ao>, <&sleep_clk>;

};



&usb0 {

	dwc3@4e00000 {

		usb-phy = <&usb_emu_phy_0>, <&usb_nop_phy>;
@@ -158,7 +132,3 @@ 
		dr_mode = "peripheral";

	};

};
 


&cpufreq_hw {

	clocks = <&bi_tcxo>, <&gcc GPLL0>;

};

qcom/blair.dtsi

+3 −6
Original line number Diff line number Diff line
@@ -1214,7 +1214,7 @@ 
	};



	dispcc: clock-controller@5f00000 {

		compatible = "qcom,holi-dispcc", "syscon";

		compatible = "qcom,blair-dispcc", "syscon";

		reg = <0x5f00000 0x20000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&VDD_CX_LEVEL>;
@@ -1223,11 +1223,10 @@ 
		clock-names = "bi_tcxo", "gcc_disp_gpll0_clk";

		#clock-cells = <1>;

		#reset-cells = <1>;

		status = "disabled";

	};



	gpucc: clock-controller@5990000 {

		compatible = "qcom,holi-gpucc", "syscon";

		compatible = "qcom,blair-gpucc", "syscon";

		reg = <0x5990000 0x9000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&VDD_CX_LEVEL>;
@@ -1241,7 +1240,6 @@ 
				"gcc_gpu_snoc_dvm_gfx_clk";

		#clock-cells = <1>;

		#reset-cells = <1>;

		status = "disabled";

	};



	cpucc: syscon@faa0018 {
@@ -1255,7 +1253,7 @@ 
	};



	debugcc: clock-controller@0 {

		compatible = "qcom,holi-debugcc";

		compatible = "qcom,blair-debugcc";

		qcom,gcc = <&gcc>;

		qcom,dispcc = <&dispcc>;

		qcom,gpucc = <&gpucc>;
@@ -1264,7 +1262,6 @@ 
		clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>;

		clock-names = "xo_clk_src";

		#clock-cells = <1>;

		status = "disabled";

	};



	cpufreq_hw: qcom,cpufreq-hw {