From: Stephen Boyd Date: Fri, 14 Dec 2018 21:27:39 +0000 (-0800) Subject: Merge branch 'clk-qcom-sdm845-lpass' into clk-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3315fe5faff4e38fafba8434ea75d90ed66a44c6;p=linux.git Merge branch 'clk-qcom-sdm845-lpass' into clk-next - Qualcomm SDM845 audio subsystem clks * clk-qcom-sdm845-lpass: clk: qcom: Add lpass clock controller driver for SDM845 dt-bindings: clock: Introduce QCOM LPASS clock bindings dt-bindings: clock: Update GCC bindings for protected-clocks --- 3315fe5faff4e38fafba8434ea75d90ed66a44c6 diff --cc drivers/clk/qcom/Kconfig index aca754f098177,23adc4c8bf9db..1b1ba54e33dde --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@@ -276,9 -293,18 +276,17 @@@ config SDM_DISPCC_84 Say Y if you want to support display devices and functionality such as splash screen. + config SDM_LPASSCC_845 + tristate "SDM845 Low Power Audio Subsystem (LPAAS) Clock Controller" - depends on COMMON_CLK_QCOM + select SDM_GCC_845 + help + Support for the LPASS clock controller on SDM845 devices. + Say Y if you want to use the LPASS branch clocks of the LPASS clock + controller to reset the LPASS subsystem. + config SPMI_PMIC_CLKDIV tristate "SPMI PMIC clkdiv Support" - depends on (COMMON_CLK_QCOM && SPMI) || COMPILE_TEST + depends on SPMI || COMPILE_TEST help This driver supports the clkdiv functionality on the Qualcomm Technologies, Inc. SPMI PMIC. It configures the frequency of diff --cc drivers/clk/qcom/Makefile index 6ed28272e176d,3d530b19bf4ab..ee8d0698e3707 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@@ -46,7 -46,7 +46,8 @@@ obj-$(CONFIG_SDM_CAMCC_845) += camcc-sd 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_GPUCC_845) += gpucc-sdm845.o + obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o