Skip to contentSkip to conversation

ASoC: multi-component - Fix S5P compile error

PATCH In review Chanwoo Choi 2 participants 3 messages Jul 19, 2010

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

Chanwoo Choi

author
#0 lore raw

PATCH 2/2 ASoC: multi-component - Fix S5P compile error

This patch fix compile error on using I2S and WM8994 common code.

Signed-off-by Chanwoo Choi <[email protected]>
Signed-off-by Joonyoung Shim <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 sound/soc/codecs/Kconfig       |    4 ++--
 sound/soc/s3c24xx/s3c-i2s-v2.c |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
sound/soc/codecs/Kconfig +2 -2
index ea1f5ed..55bc2be 100644
@@ -85,8 +85,8 @@ config SND_SOC_ALL_CODECS
 
 config SND_SOC_WM_HUBS
 	tristate
-	default y if SND_SOC_WM8993=y
-	default m if SND_SOC_WM8993=m
+	default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
+	default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m
 
 config SND_SOC_AC97_CODEC
 	tristate
sound/soc/s3c24xx/s3c-i2s-v2.c +2 -1
index 6575410..f4fbc0e 100644
@@ -32,7 +32,8 @@
 
 #undef S3C_IIS_V2_SUPPORTED
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
+	|| defined(CONFIG_CPU_S5PV210)
 #define S3C_IIS_V2_SUPPORTED
 #endif
#1 lore raw
Quoted 1 line · Chanwoo Choi

This patch fix compile error on using I2S and WM8994 common code.

This looks to be two completely separate issues and should have been sent as two separate patches, especially this one:

sound/soc/s3c24xx/s3c-i2s-v2.c line 37

Quoted 4 lines
sound/soc/s3c24xx/s3c-i2s-v2.c +2 -1
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
+	|| defined(CONFIG_CPU_S5PV210)
 #define S3C_IIS_V2_SUPPORTED

This is implmenting support for a new CPU, not fixing compile errors, and so the commit message is very misleading.

author
#2 lore raw
Quoted 6 lines · Mark Brown
Quoted 1 line · Chanwoo Choi

This patch fix compile error on using I2S and WM8994 common code.

This looks to be two completely separate issues and should have been sent as two separate patches, especially this one:

Ok, I will do.

Quoted 7 lines

sound/soc/s3c24xx/s3c-i2s-v2.c line 37

Quoted 4 lines
sound/soc/s3c24xx/s3c-i2s-v2.c +2 -1
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
+	|| defined(CONFIG_CPU_S5PV210)
 #define S3C_IIS_V2_SUPPORTED

This is implmenting support for a new CPU, not fixing compile errors, and so the commit message is very misleading.

Ok, I will modify the commit message.

Thank you,
Chanwoo Choi