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

Commit 37163726 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-qcom-sdm660' into clk-next 

 - Qualcomm SDM660 GCC support

* clk-qcom-sdm660:
  clk: qcom: gcc-sdm660: Add MODULE_LICENSE
  clk: qcom: Add Global Clock controller (GCC) driver for SDM660
parents ffd3b1c8 2725991e

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

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

			"qcom,gcc-msm8998"

			"qcom,gcc-mdm9615"

			"qcom,gcc-sdm630"

			"qcom,gcc-sdm660"

			"qcom,gcc-sdm845"



- reg : shall contain base register location and length

drivers/clk/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -243,6 +243,15 @@ config SDM_CAMCC_845 
	  Support for the camera clock controller on SDM845 devices.

	  Say Y if you want to support camera devices and camera functionality.



config SDM_GCC_660

	tristate "SDM660 Global Clock Controller"

	select QCOM_GDSC

	depends on COMMON_CLK_QCOM

	help

	  Support for the global clock controller on SDM660 devices.

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

	  i2C, USB, UFS, SDDC, PCIe, etc.



config SDM_GCC_845

	tristate "SDM845 Global Clock Controller"

	select QCOM_GDSC

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ obj-$(CONFIG_QCOM_CLK_RPMH) += clk-rpmh.o 
obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o

obj-$(CONFIG_SDM_CAMCC_845) += camcc-sdm845.o

obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o

obj-$(CONFIG_SDM_GCC_660) += gcc-sdm660.o

obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o

obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o

obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o