Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d88e30ab authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable Display clock controller for LAGOON"

parents bc8201a4 b1e8bc9a

arch/arm64/configs/vendor/lito-perf_defconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -525,7 +525,8 @@ CONFIG_SM_GPUCC_LITO=y 
CONFIG_SM_NPUCC_LITO=y

CONFIG_SM_NPUCC_LITO=y

CONFIG_SM_DEBUGCC_LITO=y

CONFIG_SM_DEBUGCC_LITO=y

CONFIG_SDM_CAMCC_LAGOON=y

CONFIG_SDM_CAMCC_LAGOON=y

CONFIG_SM_DEBUGCC_LAGOON=y

CONFIG_SDM_DEBUGCC_LAGOON=y

CONFIG_SDM_DISPCC_LAGOON=y

CONFIG_SDM_GPUCC_LAGOON=y

CONFIG_SDM_GPUCC_LAGOON=y

CONFIG_SDM_NPUCC_LAGOON=y

CONFIG_SDM_NPUCC_LAGOON=y

CONFIG_SDM_VIDEOCC_LAGOON=y

CONFIG_SDM_VIDEOCC_LAGOON=y

arch/arm64/configs/vendor/lito_defconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -539,7 +539,8 @@ CONFIG_SM_GPUCC_LITO=y 
CONFIG_SM_NPUCC_LITO=y

CONFIG_SM_NPUCC_LITO=y

CONFIG_SM_DEBUGCC_LITO=y

CONFIG_SM_DEBUGCC_LITO=y

CONFIG_SDM_CAMCC_LAGOON=y

CONFIG_SDM_CAMCC_LAGOON=y

CONFIG_SM_DEBUGCC_LAGOON=y

CONFIG_SDM_DEBUGCC_LAGOON=y

CONFIG_SDM_DISPCC_LAGOON=y

CONFIG_SDM_GPUCC_LAGOON=y

CONFIG_SDM_GPUCC_LAGOON=y

CONFIG_SDM_NPUCC_LAGOON=y

CONFIG_SDM_NPUCC_LAGOON=y

CONFIG_SDM_VIDEOCC_LAGOON=y

CONFIG_SDM_VIDEOCC_LAGOON=y

drivers/clk/qcom/Kconfig

+11 −2
Original line number Original line Diff line number Diff line
@@ -451,15 +451,24 @@ config SDM_CAMCC_LAGOON 
	  Say Y if you want to support camera devices and functionality such as

	  Say Y if you want to support camera devices and functionality such as

	  capturing pictures.

	  capturing pictures.





config SM_DEBUGCC_LAGOON

config SDM_DEBUGCC_LAGOON

	tristate "LAGOON Debug Clock Controller"

	tristate "LAGOON Debug Clock Controller"

	depends on COMMON_CLK_QCOM

	select SDM_GCC_LAGOON

	help

	help

	  Support for the debug clock controller on Qualcomm Technologies, Inc

	  Support for the debug clock controller on Qualcomm Technologies, Inc

	  LAGOON devices.

	  LAGOON devices.

	  Say Y if you want to support the clock measurement functionality

	  Say Y if you want to support the clock measurement functionality

	  of the clocks.

	  of the clocks.





config SDM_DISPCC_LAGOON

	tristate "LAGOON Display Clock Controller"

	select SDM_GCC_LAGOON

	help

	  Support for the display clock controller on Qualcomm Technologies, Inc.

	  LAGOON devices.

	  Say Y if you want to support display devices and functionality such as

	  splash screen.



config SDM_GCC_LAGOON

config SDM_GCC_LAGOON

	tristate "LAGOON Global Clock Controller"

	tristate "LAGOON Global Clock Controller"

	depends on COMMON_CLK_QCOM

	depends on COMMON_CLK_QCOM

drivers/clk/qcom/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,9 @@ obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o 
obj-$(CONFIG_QCOM_CLK_RPMH) += clk-rpmh.o

obj-$(CONFIG_QCOM_CLK_RPMH) += clk-rpmh.o

obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o

obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o

obj-$(CONFIG_SDM_CAMCC_LAGOON) += camcc-lagoon.o

obj-$(CONFIG_SDM_CAMCC_LAGOON) += camcc-lagoon.o

obj-$(CONFIG_SDM_DEBUGCC_LAGOON) += debugcc-lagoon.o

obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o

obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o

obj-$(CONFIG_SDM_DISPCC_LAGOON) += dispcc-lagoon.o

obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o

obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o

obj-$(CONFIG_SDM_GCC_LAGOON) += gcc-lagoon.o

obj-$(CONFIG_SDM_GCC_LAGOON) += gcc-lagoon.o

obj-$(CONFIG_SDM_GPUCC_LAGOON) += gpucc-lagoon.o

obj-$(CONFIG_SDM_GPUCC_LAGOON) += gpucc-lagoon.o
@@ -59,7 +61,6 @@ obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o 
obj-$(CONFIG_SDM_VIDEOCC_LAGOON) += videocc-lagoon.o

obj-$(CONFIG_SDM_VIDEOCC_LAGOON) += videocc-lagoon.o

obj-$(CONFIG_SM_CAMCC_LITO) += camcc-lito.o

obj-$(CONFIG_SM_CAMCC_LITO) += camcc-lito.o

obj-$(CONFIG_SM_DEBUGCC_BENGAL) += debugcc-bengal.o

obj-$(CONFIG_SM_DEBUGCC_BENGAL) += debugcc-bengal.o

obj-$(CONFIG_SM_DEBUGCC_LAGOON) += debugcc-lagoon.o

obj-$(CONFIG_SM_DEBUGCC_LITO) += debugcc-lito.o

obj-$(CONFIG_SM_DEBUGCC_LITO) += debugcc-lito.o

obj-$(CONFIG_SM_DISPCC_BENGAL) += dispcc-bengal.o

obj-$(CONFIG_SM_DISPCC_BENGAL) += dispcc-bengal.o

obj-$(CONFIG_SM_DISPCC_LITO) += dispcc-lito.o

obj-$(CONFIG_SM_DISPCC_LITO) += dispcc-lito.o