aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-11-23 12:40:15 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-23 12:40:15 +0100
commitbf86f07e8479f4de20d8b19748482eccda240664 (patch)
treed696ee7df6d2143b387394043c9ae23fa1c96271 /sound
parent2811fe2beb7cb9f34eef4bc9627dcabb401bc05e (diff)
parent233538501f707b0176f09af7039fec1e3fcac6e7 (diff)
downloadmrst-s0i3-test-bf86f07e8479f4de20d8b19748482eccda240664.tar.gz
mrst-s0i3-test-bf86f07e8479f4de20d8b19748482eccda240664.tar.xz
mrst-s0i3-test-bf86f07e8479f4de20d8b19748482eccda240664.zip
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc
Diffstat (limited to 'sound')
-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: