summaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx/Makefile
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-11-22 07:36:59 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-23 15:06:58 +0100
commit1c7ac01807ac89dee5e2ebf8f43fbc4cbba24af6 (patch)
treeae6669a6ffac6a7509c47844ebab90ef27f357a4 /sound/soc/s3c24xx/Makefile
parentASoC: Samsung: Rename s3c64xx I2S device (diff)
downloadlinux-1c7ac01807ac89dee5e2ebf8f43fbc4cbba24af6.tar.xz
linux-1c7ac01807ac89dee5e2ebf8f43fbc4cbba24af6.zip
ASoC: Samsung: Add common I2S driver
The I2S controllers since S3C64XX are incremental revisions, with a new feature added to the last one. The programming i/f doesn't conflict between these revisions, so it is possible to have one common driver that could manage various versions of I2S (v3, 4 & 5) Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/Makefile')
-rw-r--r--sound/soc/s3c24xx/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile
index 93de2a00df1f..1d6fc0736102 100644
--- a/sound/soc/s3c24xx/Makefile
+++ b/sound/soc/s3c24xx/Makefile
@@ -8,6 +8,7 @@ snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o
snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o
snd-soc-samsung-spdif-objs := spdif.o
snd-soc-pcm-objs := pcm.o
+snd-soc-i2s-objs := i2s.o
obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o
obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o
@@ -18,6 +19,7 @@ obj-$(CONFIG_SND_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o
obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o
obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o
obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o
+obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o
# S3C24XX Machine Support
snd-soc-jive-wm8750-objs := jive_wm8750.o