From e6043243e5c9ba11b327f7d8c2eb91bb4b950de6 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Thu, 21 Feb 2013 11:37:42 +0100
Subject: [PATCH] meta-digi-arm: Configure kernel sound with the alsa machine
 feature.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../linux/linux-del_2.6.35.14.bb              |  1 +
 .../ccardimx28js/config-sound.cfg             | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-sound.cfg

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
index 6ccc69250..9f225ba54 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
@@ -17,6 +17,7 @@ SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/master \
 SRCREV_mxs = "${AUTOREV}"
 LOCALVERSION_mxs = "mxs+master"
 KERNEL_CFG_FRAGS_ccardimx28js_mxs = "${@base_contains('DISTRO_FEATURES', 'x11', 'file://config-fb.cfg file://config-touch.cfg', '', d)}"
+KERNEL_CFG_FRAGS_ccardimx28js_mxs += "${@base_contains('MACHINE_FEATURES', 'alsa', 'file://config-sound.cfg', '', d)}"
 SRC_URI_ccardimx28js_mxs = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/master \
            file://defconfig \
 	   ${KERNEL_CFG_FRAGS} \
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-sound.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-sound.cfg
new file mode 100644
index 000000000..b8a3c5362
--- /dev/null
+++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccardimx28js/config-sound.cfg
@@ -0,0 +1,35 @@
+CONFIG_SOUND=y
+# CONFIG_SOUND_OSS_CORE is not set
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_JACK=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_MXS_SOC=y
+# CONFIG_SND_MXS_SOC_EVK_DEVB is not set
+CONFIG_SND_MXS_SOC_CCARDIMX28=y
+CONFIG_SND_MXS_SOC_DAI=y
+# CONFIG_SND_MXS_SOC_EVK_DEVB_SPDIF is not set
+CONFIG_SND_SOC_I2C_AND_SPI=y
+# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_SGTL5000=y
+# CONFIG_SOUND_PRIME is not set
+