sandbox: exynos: Move CONFIG_SOUND_WM8994 to Kconfig

Move this over to Kconfig and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index f77209a8b61d32b3be22cec7b8d3df67b77dab4e..21d5f4a97604e45c063d10629da38930663c94e3 100644 (file)
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -8,3 +8,4 @@ CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y

diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 8dd6b95d2b124206122d14affe06c8b4aa0537ab..0e7b868496d6a177b81e94e8539501f77aac6c3f 100644 (file)
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -8,3 +8,4 @@ CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y

diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 0fd084b19745e97d741e9987f526630ab4cbe03e..6c76f4d4bfe2815a90b7d178ec758c72a46a0705 100644 (file)
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -12,3 +12,4 @@ CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y

diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index cfc75cb57e79017ac2c0d4ce0162165a4aefdae2..a1c950bf867e981b450c371d0d7b7cfdf8c724f9 100644 (file)
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -36,3 +36,11 @@ config SOUND_MAX98095
          Enable the max98095 audio codec. This is connected via I2S for
          audio data and I2C for codec control. At present it only works
          with the Samsung I2S driver.
+
+config SOUND_WM8994
+       bool "Support Wolfson Micro wm8994 audio codec"
+       depends on I2S_SAMSUNG
+       help
+         Enable the wm8994 audio codec. This is connected via I2S for
+         audio data and I2C for codec control. At present it only works
+         with the Samsung I2S driver.

diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 79a7adf761cc5a714ec73bdeaad88f9325856746..95e96ecde461af18fe4beeca82d7aea8cecb70a2 100644 (file)
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -28,11 +28,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR        CONFIG_IRAM_STACK
 
-/* Sound */
-#ifdef CONFIG_CMD_SOUND
-#define CONFIG_SOUND_WM8994
-#endif
-
 /* I2C */
 #define CONFIG_MAX_I2C_NUM     8