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

diff --cc drivers/clk/qcom/Kconfig
index 5b181b182f40f56cc584d3ce6a9bee17864039da,0c1d42e519e351b9514d38f936c070262b994e62..4d478b261dfe242fe062f22df816e2ac9f24cc59
--- 1/drivers/clk/qcom/Kconfig
--- 2/drivers/clk/qcom/Kconfig
+++ b/drivers/clk/qcom/Kconfig
@@@ -235,14 -235,15 +235,23 @@@ config MSM_GCC_899
          Say Y if you want to use peripheral devices such as UART, SPI,
          i2c, USB, UFS, SD/eMMC, PCIe, etc.
  
 +config SDM_CAMCC_845
 +      tristate "SDM845 Camera Clock Controller"
 +      depends on COMMON_CLK_QCOM
 +      select SDM_GCC_845
 +      help
 +        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

diff --cc drivers/clk/qcom/Makefile
index 935f142bc155227e1db2b3ffb293b8dfa25f1061,db49b018ed4359be7917531bc8b160692becb2a3..ab892f6d847ca0149a8d8fecc0f91c96c39da8b3
--- 1/drivers/clk/qcom/Makefile
--- 2/drivers/clk/qcom/Makefile
+++ b/drivers/clk/qcom/Makefile
@@@ -39,8 -39,8 +39,9 @@@ obj-$(CONFIG_QCOM_CLK_APCS_MSM8916) += 
  obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o
  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