diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-08-16 09:41:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-22 15:17:04 -0400 |
commit | fca04aea36a82bc451ddc33dee6f9a48bb0f8a2a (patch) | |
tree | bb303141873469792ab73d326a9849c8f68aa4b1 | |
parent | 6253bac804507c3e15fd6600e0dbd962bba34aae (diff) |
ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing
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>
-rw-r--r-- | sound/soc/omap/am3517evm.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index 009533ab8d18..a997988af147 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c | |||
@@ -47,26 +47,10 @@ static int am3517evm_hw_params(struct snd_pcm_substream *substream, | |||
47 | /* Set the codec system clock for DAC and ADC */ | 47 | /* Set the codec system clock for DAC and ADC */ |
48 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, | 48 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, |
49 | CODEC_CLOCK, SND_SOC_CLOCK_IN); | 49 | CODEC_CLOCK, SND_SOC_CLOCK_IN); |
50 | if (ret < 0) { | 50 | if (ret < 0) |
51 | printk(KERN_ERR "can't set codec system clock\n"); | 51 | printk(KERN_ERR "can't set codec system clock\n"); |
52 | return ret; | ||
53 | } | ||
54 | |||
55 | ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_CLKR_SRC_CLKX, 0, | ||
56 | SND_SOC_CLOCK_IN); | ||
57 | if (ret < 0) { | ||
58 | printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_CLKR_SRC_CLKX\n"); | ||
59 | return ret; | ||
60 | } | ||
61 | 52 | ||
62 | snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_FSR_SRC_FSX, 0, | 53 | return ret; |
63 | SND_SOC_CLOCK_IN); | ||
64 | if (ret < 0) { | ||
65 | printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_FSR_SRC_FSX\n"); | ||
66 | return ret; | ||
67 | } | ||
68 | |||
69 | return 0; | ||
70 | } | 54 | } |
71 | 55 | ||
72 | static struct snd_soc_ops am3517evm_ops = { | 56 | static struct snd_soc_ops am3517evm_ops = { |