From: Stephen Boyd <sboyd@kernel.org>
Date: Thu, 18 Oct 2018 22:42:42 +0000 (-0700)
Subject: Merge branch 'clk-qcom-qcs404' into clk-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fa4c0e490387fc1eec6a7109450a7dfde24e419a;p=linux.git

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

 - Qualcomm QCS404 GCC support

* clk-qcom-qcs404:
  clk: qcom: gcc: Add global clock controller driver for QCS404
  clk: qcom: Export clk_alpha_pll_configure()
---

fa4c0e490387fc1eec6a7109450a7dfde24e419a
diff --cc Documentation/devicetree/bindings/clock/qcom,gcc.txt
index 45b827997f18f,69fa8603b5abf..52d9345c9927b
--- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
@@@ -19,8 -19,7 +19,9 @@@ Required properties 
  			"qcom,gcc-msm8996"
  			"qcom,gcc-msm8998"
  			"qcom,gcc-mdm9615"
+ 			"qcom,gcc-qcs404"
 +			"qcom,gcc-sdm630"
 +			"qcom,gcc-sdm660"
  			"qcom,gcc-sdm845"
  
  - reg : shall contain base register location and length
diff --cc drivers/clk/qcom/Kconfig
index 4d478b261dfe2,13dbfa3d96983..178b0c4c06e5c
--- a/drivers/clk/qcom/Kconfig
+++ b/drivers/clk/qcom/Kconfig
@@@ -235,23 -235,14 +235,31 @@@ 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 QCS_GCC_404
+ 	tristate "QCS404 Global Clock Controller"
+ 	depends on COMMON_CLK_QCOM
+ 	help
+ 	  Support for the global clock controller on QCS404 devices.
+ 	  Say Y if you want to use multimedia devices or peripheral
+ 	  devices such as UART, SPI, I2C, USB, 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 ab892f6d847ca,37197b90ddf5a..191367eddfc07
--- a/drivers/clk/qcom/Makefile
+++ b/drivers/clk/qcom/Makefile
@@@ -39,9 -39,8 +39,10 @@@ 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_DISPCC_845) += dispcc-sdm845.o
+ obj-$(CONFIG_QCS_GCC_404) += gcc-qcs404.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