From: Simon Glass <sjg@chromium.org>
Date: Fri, 6 Mar 2015 20:19:10 +0000 (-0700)
Subject: sandbox: exynos: Move CONFIG_I2S to Kconfig
X-Git-Tag: KARO-TX6-2015-09-18~2577
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=ed9031dbbd3e6056c6dcdac293d9c337fcd371fe

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 f452b13b05..3c0a6b3d6d 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 2151e89969..58e0516328 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 8c1d64db11..eb8c64a50d 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 599edae97f..759a10fcc3 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 9f09e147a4..c9eac15cfa 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