summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-03-06 13:19:12 -0700
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:39 -0600
commit7a170a59f3b512ccd1d3ce51a1814b60fd1ec7bc (patch)
treec3240ac22a77b11cdc7f41ac1a013bf72e39b42d
parent6bd7be278256c1e66a34c78bbe059584ba8cd9f1 (diff)
sandbox: exynos: Move CONFIG_SOUND_MAX98095 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.h1
5 files changed, 11 insertions, 1 deletions
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 3d5c870c1d..f77209a8b6 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -7,3 +7,4 @@ CONFIG_SOUND=y
CONFIG_CMD_SOUND=y
CONFIG_I2S=y
CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 123461918c..8dd6b95d2b 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -7,3 +7,4 @@ CONFIG_SOUND=y
CONFIG_CMD_SOUND=y
CONFIG_I2S=y
CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index d8c01e6be3..0fd084b197 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -11,3 +11,4 @@ CONFIG_SOUND=y
CONFIG_CMD_SOUND=y
CONFIG_I2S=y
CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index 1b97af001b..cfc75cb57e 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -28,3 +28,11 @@ config I2S_SAMSUNG
using one of the available audio codec drivers. Enabling this
option provides an implementation for sound_init() and
sound_play().
+
+config SOUND_MAX98095
+ bool "Support Maxim max98095 audio codec"
+ depends on I2S_SAMSUNG
+ help
+ 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.
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 895d6e1994..79a7adf761 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -30,7 +30,6 @@
/* Sound */
#ifdef CONFIG_CMD_SOUND
-#define CONFIG_SOUND_MAX98095
#define CONFIG_SOUND_WM8994
#endif