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

Commit cde2fda5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm/arm64: Kconfig: Add support to use the CLK_QCOM for MSMfalcon"

parents e7f64f18 e5335ad2
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ config ARCH_MSMFALCON
	select MULTI_IRQ_HANDLER
	select HAVE_ARM_ARCH_TIMER
	select MAY_HAVE_SPARSE_IRQ
	select COMMON_CLK_MSM
	select COMMON_CLK
	select COMMON_CLK_QCOM
	select QCOM_GDSC
	select PINCTRL_MSM_TLMM
	select USE_PINCTRL_IRQ
	select MSM_PM if PM
@@ -31,6 +33,7 @@ config ARCH_MSMFALCON
	select MSM_QDSP6V2_CODECS
	select MSM_AUDIO_QDSP6V2 if SND_SOC
	select MSM_RPM_SMD
	select GENERIC_IRQ_MIGRATION
	select MSM_JTAGV8 if CORESIGHT_ETMV4
	help
	This enables support for the MSMFALCON chipset. If you do not
+6 −2
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ config ARCH_MSMHAMSTER
config ARCH_MSMFALCON
	bool "Enable Support for Qualcomm Technologies Inc MSMFALCON"
	depends on ARCH_QCOM
	select COMMON_CLK_MSM
	select COMMON_CLK
	select COMMON_CLK_QCOM
	select QCOM_GDSC
	help
	  This enables support for the MSMFALCON chipset.
	  If you do not wish to build a kernel that runs
@@ -98,7 +100,9 @@ config ARCH_MSMFALCON
config ARCH_MSMTRITON
	bool "Enable Support for Qualcomm Technologies Inc MSMTRITON"
	depends on ARCH_QCOM
	select COMMON_CLK_MSM
	select COMMON_CLK
	select COMMON_CLK_QCOM
	select QCOM_GDSC
	help
	  This enables support for the MSMTRITON chipset.
	  If you do not wish to build a kernel that runs
+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_MSMCOBALT=y
CONFIG_ARCH_MSMHAMSTER=y
CONFIG_ARCH_MSMFALCON=y
CONFIG_PCI=y
CONFIG_PCI_MSM=y
CONFIG_SCHED_MC=y
+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_MSMCOBALT=y
CONFIG_ARCH_MSMHAMSTER=y
CONFIG_ARCH_MSMFALCON=y
CONFIG_PCI=y
CONFIG_PCI_MSM=y
CONFIG_SCHED_MC=y
+0 −3
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ CONFIG_MODULE_SIG_FORCE=y
CONFIG_MODULE_SIG_SHA512=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_MSMCOBALT=y
CONFIG_ARCH_MSMHAMSTER=y
CONFIG_ARCH_MSMFALCON=y
CONFIG_ARCH_MSMTRITON=y
CONFIG_PCI=y
@@ -475,7 +473,6 @@ CONFIG_RMNET_IPA3=y
CONFIG_GPIO_USB_DETECT=y
CONFIG_SEEMP_CORE=y
CONFIG_USB_BAM=y
CONFIG_MSM_MDSS_PLL=y
CONFIG_REMOTE_SPINLOCK_MSM=y
CONFIG_IOMMU_IO_PGTABLE_FAST=y
CONFIG_ARM_SMMU=y
Loading