Merge "ASoC: Update config of SND_HWDEP"

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

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

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

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

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

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

config/sdm855auto.conf

@@ -30,7 +30,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

config/sdm855autoconf.h

@@ -42,7 +42,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

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

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