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

Commit 0600f6c1 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 gcc clock driver for mdmfermium clocks"

parents aad71452 2e0e656e

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

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ Required properties: 
			"qcom,gpucc-8996-v3.0"

			"qcom,gcc-californium"

			"qcom,cc-debug-californium"

			"qcom,gcc-mdmfermium"

			"qcom,cc-debug-mdmfermium"



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

			memory mapped registers.

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

+7 −2
Original line number Diff line number Diff line
@@ -158,12 +158,17 @@ 
	};



	clock_gcc: qcom,gcc@1800000 {

		compatible = "qcom,dummycc";

		compatible = "qcom,gcc-mdmfermium";

		reg = <0x1800000 0x80000>;

		reg-names = "cc_base";

		vdd_dig-supply = <&mdmfermium_s3_level>;

		#clock-cells = <1>;

	};



	clock_debug: qcom,debug@1874000 {

		compatible = "qcom,dummycc";

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

		reg = <0x1800000 0x80000>;

		reg-names = "cc_base";

		#clock-cells = <1>;

	};

drivers/clk/msm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ obj-$(CONFIG_ARCH_MSM8996) += clock-cpu-8996.o 
# MDMCALIFORNIUM

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



# MDMFERMIUM

obj-$(CONFIG_ARCH_MDMFERMIUM)	+=clock-gcc-mdmfermium.o



# ACPU clock

obj-$(CONFIG_ARCH_MDM9640)      += clock-a7.o

obj-$(CONFIG_ARCH_MDMCALIFORNIUM)	+= clock-a7.o