summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/arndale_defconfig1
-rw-r--r--configs/smdk5250_defconfig1
-rw-r--r--configs/snow_defconfig1
-rw-r--r--drivers/sound/Kconfig9
-rw-r--r--include/configs/exynos5250-common.h1
5 files changed, 12 insertions, 1 deletions
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index f452b13b05b..3c0a6b3d6da 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_ARNDALE=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
CONFIG_SOUND=y
CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 2151e89969c..58e05163287 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_SMDK5250=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
CONFIG_SOUND=y
CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 8c1d64db11b..eb8c64a50db 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -9,3 +9,4 @@ CONFIG_CROS_EC_KEYB=y
CONFIG_CMD_CROS_EC=y
CONFIG_SOUND=y
CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index 599edae97f2..759a10fcc39 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -9,3 +9,12 @@ config SOUND
Note: At present the sound setup is somewhat tangled up in that the
audio codecs are called from the sound-i2s code. This could be
converted to driver model.
+
+config I2S
+ bool "Enable I2S support"
+ depends on SOUND
+ help
+ I2S is a serial bus often used to transmit audio data from the
+ SoC to the audio codec. This option enables sound support using
+ I2S. It calls either of the two supported codecs (no use is made
+ of driver model at present).
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 9f09e147a42..c9eac15cfab 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -31,7 +31,6 @@
/* Sound */
#ifdef CONFIG_CMD_SOUND
#define CONFIG_I2S_SAMSUNG
-#define CONFIG_I2S
#define CONFIG_SOUND_MAX98095
#define CONFIG_SOUND_WM8994
#endif