diff options
| author | Jassi Brar <jassi.brar@samsung.com> | 2010-11-22 01:36:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-23 09:06:58 -0500 |
| commit | 1c7ac01807ac89dee5e2ebf8f43fbc4cbba24af6 (patch) | |
| tree | ae6669a6ffac6a7509c47844ebab90ef27f357a4 /sound/soc/s3c24xx/Makefile | |
| parent | 0068402c58d5f3e21b863de881508248f29b464f (diff) | |
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/Makefile | 2 |
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 | |||
| 8 | snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o | 8 | snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o |
| 9 | snd-soc-samsung-spdif-objs := spdif.o | 9 | snd-soc-samsung-spdif-objs := spdif.o |
| 10 | snd-soc-pcm-objs := pcm.o | 10 | snd-soc-pcm-objs := pcm.o |
| 11 | snd-soc-i2s-objs := i2s.o | ||
| 11 | 12 | ||
| 12 | obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o | 13 | obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o |
| 13 | obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o | 14 | 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 | |||
| 18 | obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o | 19 | obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o |
| 19 | obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o | 20 | obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o |
| 20 | obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o | 21 | obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o |
| 22 | obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o | ||
| 21 | 23 | ||
| 22 | # S3C24XX Machine Support | 24 | # S3C24XX Machine Support |
| 23 | snd-soc-jive-wm8750-objs := jive_wm8750.o | 25 | snd-soc-jive-wm8750-objs := jive_wm8750.o |