Merge "arm64: defconfig: Add support for DISPCC and debugCC for YUPIK"

arch/arm64/configs/vendor/lahaina_GKI.config

@@ -245,3 +245,4 @@ CONFIG_INTERCONNECT_QCOM_YUPIK=m
 CONFIG_SM_VIDEOCC_YUPIK=m
 CONFIG_SM_CAMCC_YUPIK=m
 CONFIG_QCOM_YUPIK_LLCC=m
+CONFIG_SM_DISPCC_YUPIK=m

arch/arm64/configs/vendor/lahaina_QGKI.config

@@ -257,3 +257,4 @@ CONFIG_QTI_HW_MEMLAT_LOG=y
 CONFIG_SRAM=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_PRINT_SUSPEND_EPOCH_QGKI=y
+CONFIG_SM_DEBUGCC_YUPIK=y

drivers/clk/qcom/Kconfig

@@ -665,6 +665,24 @@ config SM_CAMCC_YUPIK
 	  Say Y if you want to support camera devices and functionality such as
 	  capturing pictures.
 
+config SM_DISPCC_YUPIK
+	tristate "YUPIK Display Clock Controller"
+	select SM_GCC_YUPIK
+	help
+	  Support for the display clock controller on Qualcomm Technologies, Inc.
+	  YUPIK devices.
+	  Say Y if you want to support display devices and functionality such as
+	  splash screen.
+
+config SM_DEBUGCC_YUPIK
+	tristate "YUPIK Debug Clock Controller"
+	depends on SM_GCC_YUPIK
+	help
+	  Support for the debug clock controller on Qualcomm Technologies, Inc.
+	  YUPIK devices.
+	  Say Y if you want to support the debug clocks such as clock measurement
+	  functionality.
+
 endif
 
 config VIRTIO_CLK

drivers/clk/qcom/Makefile

@@ -77,9 +77,11 @@ obj-$(CONFIG_SM_CAMCC_YUPIK) += camcc-yupik.o
 obj-$(CONFIG_SM_DEBUGCC_8150) += debugcc-sm8150.o
 obj-$(CONFIG_SM_DEBUGCC_HOLI) += debugcc-holi.o
 obj-$(CONFIG_SM_DEBUGCC_SHIMA) += debugcc-shima.o
+obj-$(CONFIG_SM_DEBUGCC_YUPIK) += debugcc-yupik.o
 obj-$(CONFIG_SM_DISPCC_8150) += dispcc-sm8150.o
 obj-$(CONFIG_SM_DISPCC_HOLI) += dispcc-holi.o
 obj-$(CONFIG_SM_DISPCC_SHIMA) += dispcc-shima.o
+obj-$(CONFIG_SM_DISPCC_YUPIK) += dispcc-yupik.o
 obj-$(CONFIG_SM_GCC_8150) += gcc-sm8150.o
 obj-$(CONFIG_SM_GCC_HOLI) += gcc-holi.o
 obj-$(CONFIG_SM_GCC_SHIMA) += gcc-shima.o