Skip to content

Commit 2335385

Browse files
jkrzysztLiam Girdwood
authored andcommitted
ASoC: OMAP: fix OMAP1 compilation problem
In the new code introduced with commit cf4c87a, "OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c", the way omap1 build is supposed to bypass omap2 specific functionality doesn't optimize out all omap2 specific stuff. This breaks linking phase for omap1 machines, giving "undefined reference to `omap2_mcbsp1_mux_clkr_src'" and "undefined reference to `omap2_mcbsp1_mux_fsr_src'" errors. Fix it. Created and tested against linux-2.6.37-rc1. Signed-off-by: Janusz Krzysztofik <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Paul Walmsley <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
1 parent 8f98776 commit 2335385

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

sound/soc/omap/omap-mcbsp.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,15 +644,23 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
644644

645645

646646
case OMAP_MCBSP_CLKR_SRC_CLKR:
647+
if (cpu_class_is_omap1())
648+
break;
647649
omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKR);
648650
break;
649651
case OMAP_MCBSP_CLKR_SRC_CLKX:
652+
if (cpu_class_is_omap1())
653+
break;
650654
omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKX);
651655
break;
652656
case OMAP_MCBSP_FSR_SRC_FSR:
657+
if (cpu_class_is_omap1())
658+
break;
653659
omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSR);
654660
break;
655661
case OMAP_MCBSP_FSR_SRC_FSX:
662+
if (cpu_class_is_omap1())
663+
break;
656664
omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSX);
657665
break;
658666
default:

0 commit comments

Comments
 (0)