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

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

Merge "defconfig: Enable clock controller drivers for TRINKET"

parents 957a07a7 210918ec
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,8 @@ Required properties :
		"qcom,debugcc-qcs405",
		"qcom,debugcc-qcs405",
		"qcom,debugcc-sm6150",
		"qcom,debugcc-sm6150",
		"qcom,debugcc-sdmmagpie"
		"qcom,debugcc-sdmmagpie"
		"qcom,debugcc-sdxprairie".
		"qcom,debugcc-sdxprairie",
		"qcom,debugcc-trinket".
- qcom,gcc: phandle to the GCC device node.
- qcom,gcc: phandle to the GCC device node.
- qcom,videocc: phandle to the Video CC device node.
- qcom,videocc: phandle to the Video CC device node.
- qcom,camcc: phandle to the Camera CC device node.
- qcom,camcc: phandle to the Camera CC device node.
+7 −0
Original line number Original line Diff line number Diff line
@@ -477,8 +477,14 @@ CONFIG_RMNET_IPA3=y
CONFIG_RNDIS_IPA=y
CONFIG_RNDIS_IPA=y
CONFIG_IPA_UT=y
CONFIG_IPA_UT=y
CONFIG_MSM_11AD=m
CONFIG_MSM_11AD=m
CONFIG_QCOM_CLK_SMD_RPM=y
CONFIG_SPMI_PMIC_CLKDIV=y
CONFIG_SPMI_PMIC_CLKDIV=y
CONFIG_CLOCK_CPU_OSM=y
CONFIG_CLOCK_CPU_OSM=y
CONFIG_SM_GCC_TRINKET=y
CONFIG_SM_GPUCC_TRINKET=y
CONFIG_SM_VIDEOCC_TRINKET=y
CONFIG_SM_DISPCC_TRINKET=y
CONFIG_SM_DEBUGCC_TRINKET=y
CONFIG_HWSPINLOCK=y
CONFIG_HWSPINLOCK=y
CONFIG_HWSPINLOCK_QCOM=y
CONFIG_HWSPINLOCK_QCOM=y
CONFIG_MAILBOX=y
CONFIG_MAILBOX=y
@@ -499,6 +505,7 @@ CONFIG_QCOM_CPUSS_DUMP=y
CONFIG_QCOM_RUN_QUEUE_STATS=y
CONFIG_QCOM_RUN_QUEUE_STATS=y
CONFIG_QCOM_QMI_HELPERS=y
CONFIG_QCOM_QMI_HELPERS=y
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD_RPM=y
CONFIG_MSM_SPM=y
CONFIG_MSM_SPM=y
CONFIG_MSM_L2_SPM=y
CONFIG_MSM_L2_SPM=y
CONFIG_QCOM_MEMORY_DUMP_V2=y
CONFIG_QCOM_MEMORY_DUMP_V2=y
+7 −0
Original line number Original line Diff line number Diff line
@@ -523,8 +523,14 @@ CONFIG_RMNET_IPA3=y
CONFIG_RNDIS_IPA=y
CONFIG_RNDIS_IPA=y
CONFIG_IPA_UT=y
CONFIG_IPA_UT=y
CONFIG_MSM_11AD=m
CONFIG_MSM_11AD=m
CONFIG_QCOM_CLK_SMD_RPM=y
CONFIG_SPMI_PMIC_CLKDIV=y
CONFIG_SPMI_PMIC_CLKDIV=y
CONFIG_CLOCK_CPU_OSM=y
CONFIG_CLOCK_CPU_OSM=y
CONFIG_SM_GCC_TRINKET=y
CONFIG_SM_GPUCC_TRINKET=y
CONFIG_SM_VIDEOCC_TRINKET=y
CONFIG_SM_DISPCC_TRINKET=y
CONFIG_SM_DEBUGCC_TRINKET=y
CONFIG_HWSPINLOCK=y
CONFIG_HWSPINLOCK=y
CONFIG_HWSPINLOCK_QCOM=y
CONFIG_HWSPINLOCK_QCOM=y
CONFIG_MAILBOX=y
CONFIG_MAILBOX=y
@@ -545,6 +551,7 @@ CONFIG_QCOM_CPUSS_DUMP=y
CONFIG_QCOM_RUN_QUEUE_STATS=y
CONFIG_QCOM_RUN_QUEUE_STATS=y
CONFIG_QCOM_QMI_HELPERS=y
CONFIG_QCOM_QMI_HELPERS=y
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD_RPM=y
CONFIG_MSM_SPM=y
CONFIG_MSM_SPM=y
CONFIG_MSM_L2_SPM=y
CONFIG_MSM_L2_SPM=y
CONFIG_QCOM_MEMORY_DUMP_V2=y
CONFIG_QCOM_MEMORY_DUMP_V2=y
+8 −0
Original line number Original line Diff line number Diff line
@@ -538,3 +538,11 @@ config SM_DISPCC_TRINKET
	  TRINKET devices.
	  TRINKET devices.
	  Say Y if you want to support display devices and functionality such as
	  Say Y if you want to support display devices and functionality such as
	  splash screen.
	  splash screen.

config SM_DEBUGCC_TRINKET
	tristate "TRINKET Debug Clock Controller"
	depends on COMMON_CLK_QCOM
	help
	  Support for the debug clock controller on Qualcomm Technologies, Inc
	  TRINKET devices.
	  Say Y if you want to support the clock measurement functionality.
+1 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ obj-$(CONFIG_MSM_VIDEOCC_SM6150) += videocc-sm6150.o
obj-$(CONFIG_MSM_VIDEOCC_SM8150) += videocc-sm8150.o
obj-$(CONFIG_MSM_VIDEOCC_SM8150) += videocc-sm8150.o
obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o
obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o
obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o
obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o
obj-$(CONFIG_SM_DEBUGCC_TRINKET) += debugcc-trinket.o
obj-$(CONFIG_SM_DISPCC_TRINKET) += dispcc-trinket.o
obj-$(CONFIG_SM_DISPCC_TRINKET) += dispcc-trinket.o
obj-$(CONFIG_SM_GCC_TRINKET) += gcc-trinket.o
obj-$(CONFIG_SM_GCC_TRINKET) += gcc-trinket.o
obj-$(CONFIG_SM_GPUCC_TRINKET) += gpucc-trinket.o
obj-$(CONFIG_SM_GPUCC_TRINKET) += gpucc-trinket.o
Loading