diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 12:22:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 12:22:55 +0100 |
| commit | 59e21020284e80aa6183baf9f7948bbe9801a812 (patch) | |
| tree | 65f29bcc373bd827ed674f1f0e19d9a8378d991f /sound | |
| parent | ASoC: Return proper error for omap3pandora_soc_init (diff) | |
| parent | Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lr... (diff) | |
| download | linux-59e21020284e80aa6183baf9f7948bbe9801a812.tar.xz linux-59e21020284e80aa6183baf9f7948bbe9801a812.zip | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.37
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index d211c9fa5a91..7e84f24b9a88 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -644,15 +644,23 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, case OMAP_MCBSP_CLKR_SRC_CLKR: + if (cpu_class_is_omap1()) + break; omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKR); break; case OMAP_MCBSP_CLKR_SRC_CLKX: + if (cpu_class_is_omap1()) + break; omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKX); break; case OMAP_MCBSP_FSR_SRC_FSR: + if (cpu_class_is_omap1()) + break; omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSR); break; case OMAP_MCBSP_FSR_SRC_FSX: + if (cpu_class_is_omap1()) + break; omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSX); break; default: |