Merge "defconfig: cliffs: Enable camera clock controller driver"

arch/arm64/configs/vendor/pineapple_GKI.config

@@ -282,6 +282,7 @@ CONFIG_SERIAL_MSM_GENI=m
 CONFIG_SHOW_SUSPEND_EPOCH=m
 CONFIG_SLIMBUS=m
 CONFIG_SLIM_QCOM_NGD_CTRL=m
+CONFIG_SM_CAMCC_CLIFFS=m
 CONFIG_SM_CAMCC_PINEAPPLE=m
 CONFIG_SM_DEBUGCC_PINEAPPLE=m
 CONFIG_SM_DISPCC_PINEAPPLE=m

drivers/clk/qcom/Kconfig

@@ -1247,6 +1247,15 @@ config SM_GPUCC_CLIFFS
 	  Say Y if you want to support graphics controller devices and
 	  functionality such as 3D graphics.
 
+config SM_CAMCC_CLIFFS
+	tristate "Cliffs Camera Clock Controller"
+	select SM_GCC_CLIFFS
+	help
+	  Support for the camera clock controller on Qualcomm Technologies, Inc
+	  Cliffs devices.
+	  Say Y if you want to support camera devices and functionality such as
+	  capturing pictures.
+
 endif
 
 config VIRTIO_CLK

drivers/clk/qcom/Makefile

@@ -141,6 +141,7 @@ obj-$(CONFIG_SM_GCC_HOLI) += gcc-holi.o
 obj-$(CONFIG_SM_GCC_PINEAPPLE) += gcc-pineapple.o
 obj-$(CONFIG_SM_GPUCC_6150) += gpucc-sm6150.o
 obj-$(CONFIG_SM_GPUCC_6350) += gpucc-sm6350.o
+obj-$(CONFIG_SM_CAMCC_CLIFFS) += camcc-cliffs.o
 obj-$(CONFIG_SM_CAMCC_PINEAPPLE) += camcc-pineapple.o
 obj-$(CONFIG_SM_GCC_KALAMA) += gcc-kalama.o
 obj-$(CONFIG_SM_NPUCC_8150) += npucc-sm8150.o

pineapple.bzl

@@ -13,6 +13,7 @@ def define_pineapple():
         "drivers/bus/mhi/devices/mhi_dev_uci.ko",
         "drivers/bus/mhi/host/mhi.ko",
         "drivers/char/rdbg.ko",
+        "drivers/clk/qcom/camcc-cliffs.ko",
         "drivers/clk/qcom/camcc-pineapple.ko",
         "drivers/clk/qcom/clk-dummy.ko",
         "drivers/clk/qcom/clk-qcom.ko",