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

Commit 57ca4cb9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable the GCC clock driver on MSMCOBALT"

parents 62791c45 6a915de4

Documentation/devicetree/bindings/arm/msm/clock-controller.txt

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ Required properties: 
			"qcom,cc-debug-californium"

			"qcom,gcc-mdmfermium"

			"qcom,cc-debug-mdmfermium"

			"qcom,gcc-cobalt"

			"qcom,cc-debug-cobalt"



- reg:			Pairs of physical base addresses and region sizes of

			memory mapped registers.

arch/arm/boot/dts/qcom/msmcobalt-rumi.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ 
	status = "ok";

};



&clock_gcc {

	compatible = "qcom,dummycc";

	#clock-cells = <1>;

};



&soc {

	qcom,icnss@18800000 {

	compatible = "qcom,icnss";

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+7 −2
Original line number Diff line number Diff line
@@ -308,7 +308,10 @@ 
	};



	clock_gcc: qcom,gcc@100000 {

		compatible = "qcom,dummycc";

		compatible = "qcom,gcc-cobalt";

		reg = <0x100000 0xb0000>;

		reg-names = "cc_base";

		vdd_dig-supply = <&pmcobalt_s1_level>;

		#clock-cells = <1>;

	};
@@ -323,7 +326,9 @@ 
	};



	clock_debug: qcom,debugcc@162000 {

		compatible = "qcom,dummycc";

		compatible = "qcom,cc-debug-cobalt";

		reg = <0x162000 0x4>;

		reg-names = "cc_base";

		#clock-cells = <1>;

	};

drivers/clk/msm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ obj-$(CONFIG_ARCH_MSM8996) += clock-gcc-8996.o 
obj-$(CONFIG_ARCH_MSM8996)	+= clock-mmss-8996.o

obj-$(CONFIG_ARCH_MSM8996)	+= clock-cpu-8996.o



# MSM COBALT

obj-$(CONFIG_ARCH_MSMCOBALT)	+= clock-gcc-cobalt.o



# MDMCALIFORNIUM

obj-$(CONFIG_ARCH_MDMCALIFORNIUM)	+= clock-gcc-californium.o