summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-03-06 13:19:13 -0700
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:39 -0600
commitdd573f91241ea76e7bf8efa9acad9d42693e95cd (patch)
treed0d8f612c7a5068329a11d76dce0370dea8b55ec
parent7a170a59f3b512ccd1d3ce51a1814b60fd1ec7bc (diff)
sandbox: exynos: Move CONFIG_SOUND_WM8994 to Kconfig
Move this over to Kconfig and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--configs/arndale_defconfig1
-rw-r--r--configs/smdk5250_defconfig1
-rw-r--r--configs/snow_defconfig1
-rw-r--r--drivers/sound/Kconfig8
-rw-r--r--include/configs/exynos5250-common.h5
5 files changed, 11 insertions, 5 deletions
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index f77209a8b61..21d5f4a9760 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 8dd6b95d2b1..0e7b868496d 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 0fd084b1974..6c76f4d4bfe 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 cfc75cb57e7..a1c950bf867 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 79a7adf761c..95e96ecde46 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