From dd573f91241ea76e7bf8efa9acad9d42693e95cd Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Fri, 6 Mar 2015 13:19:13 -0700
Subject: 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 f77209a..21d5f4a 100644
--- 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 8dd6b95..0e7b868 100644
--- 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 0fd084b..6c76f4d 100644
--- 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 cfc75cb..a1c950b 100644
--- 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 79a7adf..95e96ec 100644
--- 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
 
-- 
cgit v0.10.2