sandbox: exynos: Move CONFIG_I2S 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 f452b13b05b0538adb73b2325fecbd25b18354eb..3c0a6b3d6da363036312c8c4b5a2ab481f2ad5e2 100644 (file)
--- 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 2151e89969c60fd31eb06fe99e4e188512f529fa..58e05163287efd52b4bf189b6b03366231cb35a9 100644 (file)
--- 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 8c1d64db11b7aa75b7d8b17896287c0d9a36f9bf..eb8c64a50db1f0f2e262ce6d30e87cca57ac0ac4 100644 (file)
--- 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 599edae97f27265b63e94e5ac14bc7a11505f334..759a10fcc39a5e54c78fb37c8bc3128bdfb79133 100644 (file)
--- 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 9f09e147a422feabab6552825243cf730dc8ce9d..c9eac15cfab49084767ea04243d8b586957cfc15 100644 (file)
--- 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