diff options
| author | Chaithrika U S <chaithrika@ti.com> | 2009-05-28 05:10:50 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-28 09:48:38 -0400 |
| commit | be461ba836770263826457624bc4a5173a1f5040 (patch) | |
| tree | 6c951dace18890c4e070d4479ce124effe1a3a06 | |
| parent | 449bd54dcbd0b60070ce4129fedaf0f4ae044099 (diff) | |
ASoC: Add dummy S/PDIF codec support
McASP on DM646x can operate in DIT (S/PDIF) where no codec is needed.
This patch provides stub codec that can be used in these configurations.
On DM646x EVM the McASP1 is connected to the S/PDIF out.
Signed-off-by: Steve Chen <schen@mvista.com>
Signed-off-by: Pavel Kiryukhin <pkiryukhin@ru.mvista.com>
Signed-off-by: Naresh Medisetty <naresh@ti.com>
Signed-off-by: Chaithrika U S <chaithrika@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/spdif_transciever.c | 69 | ||||
| -rw-r--r-- | sound/soc/codecs/spdif_transciever.h | 17 |
4 files changed, 92 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index cb07d9b51b61..bbc97fd76648 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -18,6 +18,7 @@ config SND_SOC_ALL_CODECS | |||
| 18 | select SND_SOC_AK4535 if I2C | 18 | select SND_SOC_AK4535 if I2C |
| 19 | select SND_SOC_CS4270 if I2C | 19 | select SND_SOC_CS4270 if I2C |
| 20 | select SND_SOC_PCM3008 | 20 | select SND_SOC_PCM3008 |
| 21 | select SND_SOC_SPDIF | ||
| 21 | select SND_SOC_SSM2602 if I2C | 22 | select SND_SOC_SSM2602 if I2C |
| 22 | select SND_SOC_STAC9766 if SND_SOC_AC97_BUS | 23 | select SND_SOC_STAC9766 if SND_SOC_AC97_BUS |
| 23 | select SND_SOC_TLV320AIC23 if I2C | 24 | select SND_SOC_TLV320AIC23 if I2C |
| @@ -91,6 +92,9 @@ config SND_SOC_L3 | |||
| 91 | config SND_SOC_PCM3008 | 92 | config SND_SOC_PCM3008 |
| 92 | tristate | 93 | tristate |
| 93 | 94 | ||
| 95 | config SND_SOC_SPDIF | ||
| 96 | tristate | ||
| 97 | |||
| 94 | config SND_SOC_SSM2602 | 98 | config SND_SOC_SSM2602 |
| 95 | tristate | 99 | tristate |
| 96 | 100 | ||
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 46c007cb5625..8b7530546f4d 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile | |||
| @@ -6,6 +6,7 @@ snd-soc-ak4535-objs := ak4535.o | |||
| 6 | snd-soc-cs4270-objs := cs4270.o | 6 | snd-soc-cs4270-objs := cs4270.o |
| 7 | snd-soc-l3-objs := l3.o | 7 | snd-soc-l3-objs := l3.o |
| 8 | snd-soc-pcm3008-objs := pcm3008.o | 8 | snd-soc-pcm3008-objs := pcm3008.o |
| 9 | snd-soc-spdif-objs := spdif_transciever.o | ||
| 9 | snd-soc-ssm2602-objs := ssm2602.o | 10 | snd-soc-ssm2602-objs := ssm2602.o |
| 10 | snd-soc-stac9766-objs := stac9766.o | 11 | snd-soc-stac9766-objs := stac9766.o |
| 11 | snd-soc-tlv320aic23-objs := tlv320aic23.o | 12 | snd-soc-tlv320aic23-objs := tlv320aic23.o |
| @@ -42,6 +43,7 @@ obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o | |||
| 42 | obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o | 43 | obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o |
| 43 | obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o | 44 | obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o |
| 44 | obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o | 45 | obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o |
| 46 | obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o | ||
| 45 | obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o | 47 | obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o |
| 46 | obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o | 48 | obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o |
| 47 | obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o | 49 | obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o |
diff --git a/sound/soc/codecs/spdif_transciever.c b/sound/soc/codecs/spdif_transciever.c new file mode 100644 index 000000000000..118e976b28ac --- /dev/null +++ b/sound/soc/codecs/spdif_transciever.c | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | /* | ||
| 2 | * ALSA SoC SPDIF DIT driver | ||
| 3 | * | ||
| 4 | * This driver is used by controllers which can operate in DIT (SPDI/F) where | ||
| 5 | * no codec is needed. This file provides stub codec that can be used | ||
| 6 | * in these configurations. TI DaVinci Audio controller uses this driver. | ||
| 7 | * | ||
| 8 | * Author: Steve Chen, <schen@mvista.com> | ||
| 9 | * Copyright: (C) 2009 MontaVista Software, Inc., <source@mvista.com> | ||
| 10 | * Copyright: (C) 2009 Texas Instruments, India | ||
| 11 | * | ||
| 12 | * This program is free software; you can redistribute it and/or modify | ||
| 13 | * it under the terms of the GNU General Public License version 2 as | ||
| 14 | * published by the Free Software Foundation. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include <linux/module.h> | ||
| 18 | #include <linux/moduleparam.h> | ||
| 19 | #include <sound/soc.h> | ||
| 20 | #include <sound/pcm.h> | ||
| 21 | |||
| 22 | #define STUB_RATES SNDRV_PCM_RATE_8000_96000 | ||
| 23 | #define STUB_FORMATS SNDRV_PCM_FMTBIT_S16_LE | ||
| 24 | |||
| 25 | |||
| 26 | struct snd_soc_dai dit_stub_dai = { | ||
| 27 | .name = "DIT", | ||
| 28 | .playback = { | ||
| 29 | .stream_name = "Playback", | ||
| 30 | .channels_min = 1, | ||
| 31 | .channels_max = 384, | ||
| 32 | .rates = STUB_RATES, | ||
| 33 | .formats = STUB_FORMATS, | ||
| 34 | }, | ||
| 35 | }; | ||
| 36 | |||
| 37 | static int spdif_dit_probe(struct platform_device *pdev) | ||
| 38 | { | ||
| 39 | return snd_soc_register_dai(&dit_stub_dai); | ||
| 40 | } | ||
| 41 | |||
| 42 | static int spdif_dit_remove(struct platform_device *pdev) | ||
| 43 | { | ||
| 44 | snd_soc_unregister_dai(&dit_stub_dai); | ||
| 45 | return 0; | ||
| 46 | } | ||
| 47 | |||
| 48 | static struct platform_driver spdif_dit_driver = { | ||
| 49 | .probe = spdif_dit_probe, | ||
| 50 | .remove = spdif_dit_remove, | ||
| 51 | .driver = { | ||
| 52 | .name = "spdif-dit", | ||
| 53 | .owner = THIS_MODULE, | ||
| 54 | }, | ||
| 55 | }; | ||
| 56 | |||
| 57 | static int __init dit_modinit(void) | ||
| 58 | { | ||
| 59 | return platform_driver_register(&spdif_dit_driver); | ||
| 60 | } | ||
| 61 | |||
| 62 | static void __exit dit_exit(void) | ||
| 63 | { | ||
| 64 | platform_driver_unregister(&spdif_dit_driver); | ||
| 65 | } | ||
| 66 | |||
| 67 | module_init(dit_modinit); | ||
| 68 | module_exit(dit_exit); | ||
| 69 | |||
diff --git a/sound/soc/codecs/spdif_transciever.h b/sound/soc/codecs/spdif_transciever.h new file mode 100644 index 000000000000..296f2eb6c4ef --- /dev/null +++ b/sound/soc/codecs/spdif_transciever.h | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /* | ||
| 2 | * ALSA SoC DIT/DIR driver header | ||
| 3 | * | ||
| 4 | * Author: Steve Chen, <schen@mvista.com> | ||
| 5 | * Copyright: (C) 2008 MontaVista Software, Inc., <source@mvista.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #ifndef CODEC_STUBS_H | ||
| 13 | #define CODEC_STUBS_H | ||
| 14 | |||
| 15 | extern struct snd_soc_dai dit_stub_dai; | ||
| 16 | |||
| 17 | #endif /* CODEC_STUBS_H */ | ||
