summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-24 11:22:55 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-24 11:22:55 +0000
commit59e21020284e80aa6183baf9f7948bbe9801a812 (patch)
tree65f29bcc373bd827ed674f1f0e19d9a8378d991f /sound/soc
parent5c12d20145ce30f9f8b7415d36dace5fb4dcc4f0 (diff)
parentbf86f07e8479f4de20d8b19748482eccda240664 (diff)
downloadlinux-3.10-59e21020284e80aa6183baf9f7948bbe9801a812.tar.gz
linux-3.10-59e21020284e80aa6183baf9f7948bbe9801a812.tar.bz2
linux-3.10-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/soc')
-rw-r--r--sound/soc/omap/omap-mcbsp.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index d211c9fa5a9..7e84f24b9a8 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: