From: Stephen Boyd Date: Thu, 18 Oct 2018 22:41:51 +0000 (-0700) Subject: Merge branch 'clk-qcom-sdm660' into clk-next X-Git-Tag: v5.4-rc1~2301^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37163726e1fdfbc428c3e01a1f1a16407228510a;p=platform%2Fkernel%2Flinux-rpi.git 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 --- 37163726e1fdfbc428c3e01a1f1a16407228510a diff --cc drivers/clk/qcom/Kconfig index 5b181b1,0c1d42e..4d478b2 --- a/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 935f142,db49b01..ab892f6 --- a/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