ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 16 Aug 2012 13:41:03 +0000 (16:41 +0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:17:04 +0000 (20:17 +0100)
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>
sound/soc/omap/am3517evm.c

index 009533ab8d1894054ed07c05ae140362d6738582..a997988af14785701c30b64a502c5fd6f1277fe6 100644 (file)
@@ -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 = {