diff options
author | Tony Lindgren <tony@atomide.com> | 2012-11-21 12:42:25 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 14:42:19 -0500 |
commit | e650794ae8f9799ee88f6ab67882ed3472d99595 (patch) | |
tree | fb274da95286491da54f6ae1f161f6f06e3cac2e /sound/soc/omap/omap-mcbsp.c | |
parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) |
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>
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index a6ee15747859..09167609c93e 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <sound/initval.h> | 34 | #include <sound/initval.h> |
35 | #include <sound/soc.h> | 35 | #include <sound/soc.h> |
36 | 36 | ||
37 | #include <plat/cpu.h> | ||
38 | #include <linux/platform_data/asoc-ti-mcbsp.h> | 37 | #include <linux/platform_data/asoc-ti-mcbsp.h> |
39 | #include "mcbsp.h" | 38 | #include "mcbsp.h" |
40 | #include "omap-mcbsp.h" | 39 | #include "omap-mcbsp.h" |
@@ -512,7 +511,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, | |||
512 | regs->srgr2 |= CLKSM; | 511 | regs->srgr2 |= CLKSM; |
513 | break; | 512 | break; |
514 | case OMAP_MCBSP_SYSCLK_CLKS_FCLK: | 513 | case OMAP_MCBSP_SYSCLK_CLKS_FCLK: |
515 | if (cpu_class_is_omap1()) { | 514 | if (mcbsp_omap1()) { |
516 | err = -EINVAL; | 515 | err = -EINVAL; |
517 | break; | 516 | break; |
518 | } | 517 | } |
@@ -520,7 +519,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, | |||
520 | MCBSP_CLKS_PRCM_SRC); | 519 | MCBSP_CLKS_PRCM_SRC); |
521 | break; | 520 | break; |
522 | case OMAP_MCBSP_SYSCLK_CLKS_EXT: | 521 | case OMAP_MCBSP_SYSCLK_CLKS_EXT: |
523 | if (cpu_class_is_omap1()) { | 522 | if (mcbsp_omap1()) { |
524 | err = 0; | 523 | err = 0; |
525 | break; | 524 | break; |
526 | } | 525 | } |