Skip to content

Commit

Permalink
ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing
Browse files Browse the repository at this point in the history
The muxing is done at board level, no need to do it in the ASoC machine
driver.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Aug 22, 2012
1 parent 6253bac commit fca04ae
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions sound/soc/omap/am3517evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,10 @@ static int am3517evm_hw_params(struct snd_pcm_substream *substream,
/* Set the codec system clock for DAC and ADC */
ret = snd_soc_dai_set_sysclk(codec_dai, 0,
CODEC_CLOCK, SND_SOC_CLOCK_IN);
if (ret < 0) {
if (ret < 0)
printk(KERN_ERR "can't set codec system clock\n");
return ret;
}

ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_CLKR_SRC_CLKX, 0,
SND_SOC_CLOCK_IN);
if (ret < 0) {
printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_CLKR_SRC_CLKX\n");
return ret;
}

snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_FSR_SRC_FSX, 0,
SND_SOC_CLOCK_IN);
if (ret < 0) {
printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_FSR_SRC_FSX\n");
return ret;
}

return 0;
return ret;
}

static struct snd_soc_ops am3517evm_ops = {
Expand Down

0 comments on commit fca04ae

Please sign in to comment.