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

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()
parents 37163726 652f1813

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-msm8998"

			"qcom,gcc-mdm9615"

			"qcom,gcc-qcs404"

			"qcom,gcc-sdm630"

			"qcom,gcc-sdm660"

			"qcom,gcc-sdm845"

drivers/clk/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -235,6 +235,14 @@ config MSM_GCC_8998 
	  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

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ obj-$(CONFIG_QCOM_CLK_APCS_MSM8916) += apcs-msm8916.o 
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_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

drivers/clk/qcom/clk-alpha-pll.c

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ void clk_alpha_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap, 
	if (pll->flags & SUPPORTS_FSM_MODE)

		qcom_pll_set_fsm_mode(regmap, PLL_MODE(pll), 6, 0);

}

EXPORT_SYMBOL_GPL(clk_alpha_pll_configure);



static int clk_alpha_pll_hwfsm_enable(struct clk_hw *hw)

{