From 9a8caf4aaf1c68c9480f8ec744a45868031226c8 Mon Sep 17 00:00:00 2001 From: Laxminath Kasam Date: Wed, 3 Jan 2018 21:13:17 +0530 Subject: [PATCH] ASoC: Update config of SND_HWDEP As CONFIG_SND_HWDEP is defined by default in kernel tree, msm-pcm-routing-devdep.c file in audio drivers gets compiled always. Use CONFIG_SND_HWDEP_ROUTING config instead of CONFIG_SND_HWDEP to compile msm-pcm-routing-devdep.c file. Change-Id: I19c4b0a56dbe6c4890ece645fcf100687f762f5d Signed-off-by: Laxminath Kasam Signed-off-by: Meng Wang --- asoc/Kbuild | 2 +- config/sdm670auto.conf | 2 +- config/sdm670auto_static.conf | 2 +- config/sdm670autoconf.h | 4 ++-- config/sdm845auto.conf | 2 +- config/sdm845autoconf.h | 4 ++-- config/sdm855auto.conf | 2 +- config/sdm855autoconf.h | 2 +- config/sdxpoorwillsauto.conf | 2 +- config/sdxpoorwillsautoconf.h | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/asoc/Kbuild b/asoc/Kbuild index 4ebce00485b1..00c2d38059ca 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -122,7 +122,7 @@ endif ifdef CONFIG_DOLBY_LICENSE PLATFORM_OBJS += msm-ds2-dap-config.o endif -ifdef CONFIG_SND_HWDEP +ifdef CONFIG_SND_HWDEP_ROUTING PLATFORM_OBJS += msm-pcm-routing-devdep.o endif ifdef CONFIG_QTI_PP diff --git a/config/sdm670auto.conf b/config/sdm670auto.conf index 07f195b28f7b..4c0b284c9c96 100644 --- a/config/sdm670auto.conf +++ b/config/sdm670auto.conf @@ -33,7 +33,7 @@ CONFIG_MSM_CDC_PINCTRL=m CONFIG_SND_SOC_WCD_MBHC_ADC=m CONFIG_SND_SOC_WCD_MBHC_LEGACY=m CONFIG_QTI_PP=m -CONFIG_SND_HWDEP=m +CONFIG_SND_HWDEP_ROUTING=m CONFIG_DTS_EAGLE=m CONFIG_DOLBY_DS2=m CONFIG_DOLBY_LICENSE=m diff --git a/config/sdm670auto_static.conf b/config/sdm670auto_static.conf index dc555646594d..91a84649da8f 100644 --- a/config/sdm670auto_static.conf +++ b/config/sdm670auto_static.conf @@ -33,7 +33,7 @@ CONFIG_MSM_CDC_PINCTRL=y CONFIG_SND_SOC_WCD_MBHC_ADC=y CONFIG_SND_SOC_WCD_MBHC_LEGACY=y CONFIG_QTI_PP=y -CONFIG_SND_HWDEP=y +CONFIG_SND_HWDEP_ROUTING=y CONFIG_DTS_EAGLE=y CONFIG_DOLBY_DS2=y CONFIG_DOLBY_LICENSE=y diff --git a/config/sdm670autoconf.h b/config/sdm670autoconf.h index 462862f31c50..55f9548fc44a 100644 --- a/config/sdm670autoconf.h +++ b/config/sdm670autoconf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -43,7 +43,7 @@ #define CONFIG_SND_SOC_QDSP6V2 1 #define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1 #define CONFIG_QTI_PP 1 -#define CONFIG_SND_HWDEP 1 +#define CONFIG_SND_HWDEP_ROUTING 1 #define CONFIG_DTS_EAGLE 1 #define CONFIG_DOLBY_DS2 1 #define CONFIG_DOLBY_LICENSE 1 diff --git a/config/sdm845auto.conf b/config/sdm845auto.conf index 5234e2b3a618..4c195b43ddc6 100644 --- a/config/sdm845auto.conf +++ b/config/sdm845auto.conf @@ -27,7 +27,7 @@ CONFIG_SOUNDWIRE=y CONFIG_SND_SOC_QDSP6V2=y CONFIG_SND_SOC_WCD_MBHC_ADC=y CONFIG_QTI_PP=y -CONFIG_SND_HWDEP=y +CONFIG_SND_HWDEP_ROUTING=y CONFIG_DTS_EAGLE=y CONFIG_DOLBY_DS2=y CONFIG_DOLBY_LICENSE=y diff --git a/config/sdm845autoconf.h b/config/sdm845autoconf.h index fcef4c13e776..6ef465a61871 100644 --- a/config/sdm845autoconf.h +++ b/config/sdm845autoconf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -38,7 +38,7 @@ #define CONFIG_SND_SOC_QDSP6V2 1 #define CONFIG_MSM_CDC_PINCTRL 1 #define CONFIG_QTI_PP 1 -#define CONFIG_SND_HWDEP 1 +#define CONFIG_SND_HWDEP_ROUTING 1 #define CONFIG_DTS_EAGLE 1 #define CONFIG_DOLBY_DS2 1 #define CONFIG_DOLBY_LICENSE 1 diff --git a/config/sdm855auto.conf b/config/sdm855auto.conf index 5257790c6173..48d82f1cdb43 100644 --- a/config/sdm855auto.conf +++ b/config/sdm855auto.conf @@ -27,7 +27,7 @@ CONFIG_SOUNDWIRE=m CONFIG_SND_SOC_QDSP6V2=m CONFIG_SND_SOC_WCD_MBHC_ADC=m CONFIG_QTI_PP=m -CONFIG_SND_HWDEP=m +CONFIG_SND_HWDEP_ROUTING=m CONFIG_DTS_EAGLE=m CONFIG_DOLBY_DS2=m CONFIG_DOLBY_LICENSE=m diff --git a/config/sdm855autoconf.h b/config/sdm855autoconf.h index 593934adfee0..77923c88546e 100644 --- a/config/sdm855autoconf.h +++ b/config/sdm855autoconf.h @@ -39,7 +39,7 @@ #define CONFIG_SND_SOC_WCD_MBHC_ADC 1 #define CONFIG_SND_SOC_QDSP6V2 1 #define CONFIG_QTI_PP 1 -#define CONFIG_SND_HWDEP 1 +#define CONFIG_SND_HWDEP_ROUTING 1 #define CONFIG_DTS_EAGLE 1 #define CONFIG_DOLBY_DS2 1 #define CONFIG_DOLBY_LICENSE 1 diff --git a/config/sdxpoorwillsauto.conf b/config/sdxpoorwillsauto.conf index d9dd081e876a..dee34a08be5d 100644 --- a/config/sdxpoorwillsauto.conf +++ b/config/sdxpoorwillsauto.conf @@ -24,6 +24,6 @@ CONFIG_MSM_CDC_PINCTRL=y CONFIG_WCD9XXX_CODEC_CORE=y CONFIG_SND_SOC_WCD_MBHC_ADC=y CONFIG_QTI_PP=y -CONFIG_SND_HWDEP=y +CONFIG_SND_HWDEP_ROUTING=y CONFIG_SND_SOC_MACHINE_SDXPOORWILLS=y CONFIG_SND_SOC_MSM_STUB=y diff --git a/config/sdxpoorwillsautoconf.h b/config/sdxpoorwillsautoconf.h index 9fc6258fe1b3..7b7dac403b63 100644 --- a/config/sdxpoorwillsautoconf.h +++ b/config/sdxpoorwillsautoconf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -37,6 +37,6 @@ #define CONFIG_WCD9XXX_CODEC_CORE 1 #define CONFIG_SND_SOC_WCD_MBHC_ADC 1 #define CONFIG_QTI_PP 1 -#define CONFIG_SND_HWDEP 1 +#define CONFIG_SND_HWDEP_ROUTING 1 #define CONFIG_SND_SOC_MACHINE_SDXPOORWILLS 1 #define CONFIG_SND_SOC_MSM_STUB 1