Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support

We cannot include any plat or mach headers for the multiplatform
support.

Fix the issue by defining local mcbsp_omap1().

Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Tony Lindgren and committed by
Mark Brown
e650794a 9489e9dc

+9 -6
+1 -3
sound/soc/omap/mcbsp.c
··· 28 28 29 29 #include <linux/platform_data/asoc-ti-mcbsp.h> 30 30 31 - #include <plat/cpu.h> 32 - 33 31 #include "mcbsp.h" 34 32 35 33 static void omap_mcbsp_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val) ··· 610 612 * system will refuse to enter idle if the CLKS pin source is not reset 611 613 * back to internal source. 612 614 */ 613 - if (!cpu_class_is_omap1()) 615 + if (!mcbsp_omap1()) 614 616 omap2_mcbsp_set_clks_src(mcbsp, MCBSP_CLKS_PRCM_SRC); 615 617 616 618 spin_lock(&mcbsp->lock);
+6
sound/soc/omap/mcbsp.h
··· 26 26 27 27 #include "omap-pcm.h" 28 28 29 + #ifdef CONFIG_ARCH_OMAP1 30 + #define mcbsp_omap1() 1 31 + #else 32 + #define mcbsp_omap1() 0 33 + #endif 34 + 29 35 /* McBSP register numbers. Register address offset = num * reg_step */ 30 36 enum { 31 37 /* Common registers */
+2 -3
sound/soc/omap/omap-mcbsp.c
··· 34 34 #include <sound/initval.h> 35 35 #include <sound/soc.h> 36 36 37 - #include <plat/cpu.h> 38 37 #include <linux/platform_data/asoc-ti-mcbsp.h> 39 38 #include "mcbsp.h" 40 39 #include "omap-mcbsp.h" ··· 511 512 regs->srgr2 |= CLKSM; 512 513 break; 513 514 case OMAP_MCBSP_SYSCLK_CLKS_FCLK: 514 - if (cpu_class_is_omap1()) { 515 + if (mcbsp_omap1()) { 515 516 err = -EINVAL; 516 517 break; 517 518 } ··· 519 520 MCBSP_CLKS_PRCM_SRC); 520 521 break; 521 522 case OMAP_MCBSP_SYSCLK_CLKS_EXT: 522 - if (cpu_class_is_omap1()) { 523 + if (mcbsp_omap1()) { 523 524 err = 0; 524 525 break; 525 526 }