Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206561
b: refs/heads/master
c: 4379320
h: refs/heads/master
i:
  206559: 2a01e73
v: v3
  • Loading branch information
Eric Bénard authored and Mark Brown committed Jun 18, 2010
1 parent 5be7369 commit 9ed5808
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66517915e0954ee027b889f452511945f7a9f3ec
refs/heads/master: 43793207fdcede490edf26a813a92b11ef434a13
2 changes: 1 addition & 1 deletion trunk/sound/soc/imx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ config SND_SOC_PHYCORE_AC97

config SND_SOC_EUKREA_TLV320
bool "Eukrea TLV320"
depends on MACH_EUKREA_MBIMX27_BASEBOARD
depends on MACH_EUKREA_MBIMX27_BASEBOARD || MACH_EUKREA_MBIMXSD_BASEBOARD
select SND_IMX_SOC
select SND_SOC_TLV320AIC23
help
Expand Down
3 changes: 2 additions & 1 deletion trunk/sound/soc/imx/eukrea-tlv320.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
pr_err("%s: failed setting codec sysclk\n", __func__);
return ret;
}
snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);

ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0,
SND_SOC_CLOCK_IN);
Expand Down Expand Up @@ -100,7 +101,7 @@ static int __init eukrea_tlv320_init(void)
{
int ret;

if (!machine_is_eukrea_cpuimx27())
if (!machine_is_eukrea_cpuimx27() && !machine_is_eukrea_cpuimx25sd())
/* return happy. We might run on a totally different machine */
return 0;

Expand Down

0 comments on commit 9ed5808

Please sign in to comment.