evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
MSMfalcon requires to use COMMON_CLK and COMMON_CLK_QCOM as the clock
framework. Fix the following for CLK_QCOM
 - Add new configs for common clock framework.
 - Remove compilation of audio-ext for COMMON_CLK.
 - Remove ARCH hamster and cobalt from falcon defconfig.
 - Remove ARCH falcon from cobalt defconfig.

Change-Id: I560d62f9698ddf73848186a6740632735d574b0f
Signed-off-by: Taniya Das <tdas@codeaurora.org>
This commit is contained in:
Taniya Das 2016-09-30 11:07:37 +05:30 • committed by Amit Nischal
parent 057bdafd97
commit e5335ad216
7 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/mach-qcom/Kconfig
View file

@ -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

8
arch/arm64/Kconfig.platforms
View file

@ -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

1
arch/arm64/configs/msmcortex-perf_defconfig
View file

@ -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

1
arch/arm64/configs/msmcortex_defconfig
View file

@ -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

3
arch/arm64/configs/msmfalcon-perf_defconfig
View file

@ -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
@ -476,7 +474,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

3
arch/arm64/configs/msmfalcon_defconfig
View file

@ -42,8 +42,6 @@ CONFIG_MODULE_SIG_SHA512=y
CONFIG_PARTITION_ADVANCED=y
# CONFIG_IOSCHED_DEADLINE is not set
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_MSMCOBALT=y
CONFIG_ARCH_MSMHAMSTER=y
CONFIG_ARCH_MSMFALCON=y
CONFIG_ARCH_MSMTRITON=y
CONFIG_PCI=y
@ -486,7 +484,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_IOMMU_IO_PGTABLE_FAST_SELFTEST=y

8
sound/soc/codecs/Makefile
View file

@ -136,7 +136,9 @@ snd-soc-wcd9335-objs := wcd9335.o
snd-soc-wcd934x-objs := wcd934x.o
snd-soc-wcd9xxx-objs := wcd9xxx-resmgr.o wcd9xxx-mbhc.o wcd9xxx-common.o wcdcal-hwdep.o
snd-soc-wcd9xxx-v2-objs := wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o
audio-ext-clock-objs := audio-ext-clk.o
ifeq ($(CONFIG_COMMON_CLK_MSM), y)
audio-ext-clock-objs := audio-ext-clk.o
endif
snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o
snd-soc-wsa881x-objs := wsa881x.o wsa881x-tables.o wsa881x-regmap.o wsa881x-temp-sensor.o
snd-soc-wcd-mbhc-objs := wcd-mbhc-v2.o
@ -344,7 +346,9 @@ obj-$(CONFIG_SND_SOC_WCD9320) += snd-soc-wcd9320.o
obj-$(CONFIG_SND_SOC_WCD9330) += snd-soc-wcd9330.o
obj-$(CONFIG_SND_SOC_WCD9335) += snd-soc-wcd9335.o
obj-$(CONFIG_SND_SOC_WCD934X) += wcd934x/
obj-$(CONFIG_AUDIO_EXT_CLK) += audio-ext-clock.o
ifeq ($(CONFIG_COMMON_CLK_MSM), y)
obj-$(CONFIG_AUDIO_EXT_CLK) += audio-ext-clock.o
endif
obj-$(CONFIG_SND_SOC_WCD9XXX) += snd-soc-wcd9xxx.o
obj-$(CONFIG_SND_SOC_WCD9XXX_V2) += snd-soc-wcd9xxx-v2.o
obj-$(CONFIG_SND_SOC_WCD_CPE) += snd-soc-wcd-cpe.o