aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/imx
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-06-17 09:44:01 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-06-17 20:56:45 -0400
commit43793207fdcede490edf26a813a92b11ef434a13 (patch)
tree4ef6d86c7c8d06f3ac49c2552f5505f7a2f7b24a /sound/soc/imx
parent66517915e0954ee027b889f452511945f7a9f3ec (diff)
ASoC: eukrea-tlv320: add support for our i.MX25 board
* tdm slot has to be configured to get sound working on i.MX25 Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/imx')
-rw-r--r--sound/soc/imx/Kconfig2
-rw-r--r--sound/soc/imx/eukrea-tlv320.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index 079b23bb0b03..6ef57e056d6a 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -31,7 +31,7 @@ config SND_SOC_PHYCORE_AC97
31 31
32config SND_SOC_EUKREA_TLV320 32config SND_SOC_EUKREA_TLV320
33 bool "Eukrea TLV320" 33 bool "Eukrea TLV320"
34 depends on MACH_EUKREA_MBIMX27_BASEBOARD 34 depends on MACH_EUKREA_MBIMX27_BASEBOARD || MACH_EUKREA_MBIMXSD_BASEBOARD
35 select SND_IMX_SOC 35 select SND_IMX_SOC
36 select SND_SOC_TLV320AIC23 36 select SND_SOC_TLV320AIC23
37 help 37 help
diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c
index 968380a93e89..45f5e4b32cb5 100644
--- a/sound/soc/imx/eukrea-tlv320.c
+++ b/sound/soc/imx/eukrea-tlv320.c
@@ -60,6 +60,7 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
60 pr_err("%s: failed setting codec sysclk\n", __func__); 60 pr_err("%s: failed setting codec sysclk\n", __func__);
61 return ret; 61 return ret;
62 } 62 }
63 snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);
63 64
64 ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0, 65 ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0,
65 SND_SOC_CLOCK_IN); 66 SND_SOC_CLOCK_IN);
@@ -100,7 +101,7 @@ static int __init eukrea_tlv320_init(void)
100{ 101{
101 int ret; 102 int ret;
102 103
103 if (!machine_is_eukrea_cpuimx27()) 104 if (!machine_is_eukrea_cpuimx27() && !machine_is_eukrea_cpuimx25sd())
104 /* return happy. We might run on a totally different machine */ 105 /* return happy. We might run on a totally different machine */
105 return 0; 106 return 0;
106 107