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

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

Merge "clk: qcom: Add the GCC clock driver for SDMSHRIKE" into msm-4.14

parents e49de747 f9c93b94

Documentation/devicetree/bindings/clock/qcom,gcc.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Required properties : 
			"qcom,gcc-msm8996"

			"qcom,gcc-mdm9615"

			"qcom,gcc-sdm855"

			"qcom,gcc-sdmshrike"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

drivers/clk/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -297,3 +297,12 @@ config MSM_GPUCC_SDM855 
	  Support for the graphics clock controller on Qualcomm Technologies, Inc.

	  sdm855 devices.

	  Say Y if you want to support graphics controller devices.



config MSM_GCC_SDMSHRIKE

	tristate "SDMSHRIKE Global Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the global clock controller on Qualcomm Technologies, Inc

	  SDMSHRIKE devices.

	  Say Y if you want to use peripheral devices such as UART, SPI, i2c,

	  USB, UFS, SD/eMMC, PCIe, etc.

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_MSM_GCC_8974) += gcc-msm8974.o 
obj-$(CONFIG_MSM_GCC_8994) += gcc-msm8994.o

obj-$(CONFIG_MSM_GCC_8996) += gcc-msm8996.o

obj-$(CONFIG_MSM_GCC_SDM855) += gcc-sdm855.o

obj-$(CONFIG_MSM_GCC_SDMSHRIKE) += gcc-sdmshrike.o

obj-$(CONFIG_MSM_GPUCC_SDM855) += gpucc-sdm855.o

obj-$(CONFIG_MSM_LCC_8960) += lcc-msm8960.o

obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o