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

diff --cc drivers/clk/qcom/Kconfig
index aca754f,23adc4c..1b1ba54
--- 1/drivers/clk/qcom/Kconfig
--- 2/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.
  
 -      depends on COMMON_CLK_QCOM
+ config SDM_LPASSCC_845
+       tristate "SDM845 Low Power Audio Subsystem (LPAAS) Clock Controller"
+       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 6ed2827,3d530b1..ee8d069
--- 1/drivers/clk/qcom/Makefile
--- 2/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