From: Stephen Boyd Date: Fri, 14 Dec 2018 21:26:21 +0000 (-0800) Subject: Merge branches 'clk-qcom-kconfig', 'clk-qcom-gpucc', 'clk-qcom-qcs404-rpm', 'clk... X-Git-Tag: Ubuntu-5.0.0-8.9~982^2~9 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f4ad7fba066f70ccd50816476e2f8700013c0724;p=mirror_ubuntu-disco-kernel.git Merge branches 'clk-qcom-kconfig', 'clk-qcom-gpucc', 'clk-qcom-qcs404-rpm', 'clk-qcom-spi' and 'clk-qcom-videocc-binding' into clk-next - Qualcomm SDM845 GPU clock controllers - Qualcomm QCS404 RPM clk support * clk-qcom-kconfig: clk: qcom: Move to menuconfig and reduce lines * clk-qcom-gpucc: dt-bindings: clock: qcom: Fix the xo parent in gpucc example clk: qcom: gpu_cc_gmu_clk_src has 5 parents, not 6 clk: qcom: Add a dummy enable function for GX gdsc clk: qcom: gdsc: Don't override existing gdsc pd functions clk: qcom: Add graphics clock controller driver for SDM845 dt-bindings: clock: Introduce QCOM Graphics clock bindings * clk-qcom-qcs404-rpm: clk: qcom: smd: Add support for QCS404 rpm clocks * clk-qcom-spi: clk: qcom: msm8916: Additional clock rates for spi * clk-qcom-videocc-binding: dt-bindings: clock: Require #reset-cells in sdm845-videocc --- f4ad7fba066f70ccd50816476e2f8700013c0724 diff --cc drivers/clk/qcom/Kconfig index a611531df115,bceee89f83a4,6f3e4663d84f,a611531df115,a611531df115,a611531df115..aca754f09817 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@@@@@@ -273,9 -250,8 -273,18 -273,9 -273,9 -273,9 +250,16 @@@@@@@ config SDM_GCC_84 Say Y if you want to use peripheral devices such as UART, SPI, i2C, USB, UFS, SDDC, PCIe, etc. ++ +++config SDM_GPUCC_845 ++ +++ tristate "SDM845 Graphics Clock Controller" - depends on COMMON_CLK_QCOM ++ +++ select SDM_GCC_845 ++ +++ help ++ +++ Support for the graphics clock controller on SDM845 devices. ++ +++ Say Y if you want to support graphics controller devices and ++ +++ functionality such as 3D graphics. ++ +++ config SDM_VIDEOCC_845 tristate "SDM845 Video Clock Controller" - ---- depends on COMMON_CLK_QCOM select SDM_GCC_845 select QCOM_GDSC help