summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorGraeme Gregory <gg@opensource.wolfsonmicro.com>2007-02-14 13:20:46 +0100
committerJaroslav Kysela <perex@suse.cz>2007-05-11 16:55:37 +0200
commit86e1f0df2f88fd86657ddb993bba468a75128e02 (patch)
tree8e19db09fca7beb6aa75f0a7f8eb1f43cecd28b2 /sound/soc
parentc0f41bb1717ae31f806615e81b808753271dd3d9 (diff)
downloadlinux-3.10-86e1f0df2f88fd86657ddb993bba468a75128e02.tar.gz
linux-3.10-86e1f0df2f88fd86657ddb993bba468a75128e02.tar.bz2
linux-3.10-86e1f0df2f88fd86657ddb993bba468a75128e02.zip
[ALSA] ASoC Samsung S3C24xx build
This patch builds the Samsung S3C24xx audio DMA and I2S drivers. Signed-off-by: Graeme Gregory <gg@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/Kconfig1
-rw-r--r--sound/soc/Makefile2
-rw-r--r--sound/soc/s3c24xx/Kconfig16
-rw-r--r--sound/soc/s3c24xx/Makefile6
4 files changed, 24 insertions, 1 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index dccaa4be679..03e04aecd74 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -26,6 +26,7 @@ menu "SoC Platforms"
depends on SND_SOC
source "sound/soc/at91/Kconfig"
source "sound/soc/pxa/Kconfig"
+source "sound/soc/s3c24xx/Kconfig"
endmenu
# Supported codecs
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 98e6f49dafc..0ae2e49036f 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,4 +1,4 @@
snd-soc-core-objs := soc-core.o soc-dapm.o
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
-obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/
+obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/ s3c24xx/
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
new file mode 100644
index 00000000000..433da9f854a
--- /dev/null
+++ b/sound/soc/s3c24xx/Kconfig
@@ -0,0 +1,16 @@
+menu "SoC Audio for the Samsung S3C24XX"
+
+config SND_S3C24XX_SOC
+ tristate "SoC Audio for the Samsung S3C24XX chips"
+ depends on ARCH_S3C2410 && SND
+ select SND_PCM
+ help
+ Say Y or M if you want to add support for codecs attached to
+ the S3C24XX AC97, I2S or SSP interface. You will also need
+ to select the audio interfaces to support below.
+
+config SND_S3C24XX_SOC_I2S
+ tristate
+
+endmenu
+
diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile
new file mode 100644
index 00000000000..6f0fffcb30f
--- /dev/null
+++ b/sound/soc/s3c24xx/Makefile
@@ -0,0 +1,6 @@
+# S3c24XX Platform Support
+snd-soc-s3c24xx-objs := s3c24xx-pcm.o
+snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o
+
+obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o
+obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o