summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/audmux-v1.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-02-12 22:38:31 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-02-24 10:06:59 +0100
commit51918075d74978d6ca6ec14c81f55938f24108a2 (patch)
tree54e2a03e19bc8e9be1f1e9add5b950c8cddebcf8 /arch/arm/plat-mxc/audmux-v1.c
parent6574305b0ed32f286dcebd653a2f3ba4e421f06c (diff)
arm/imx/audmux-v1: use SoC-prefixed names
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/audmux-v1.c')
-rw-r--r--arch/arm/plat-mxc/audmux-v1.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/audmux-v1.c b/arch/arm/plat-mxc/audmux-v1.c
index da6387dcdf21..b62917ca3f95 100644
--- a/arch/arm/plat-mxc/audmux-v1.c
+++ b/arch/arm/plat-mxc/audmux-v1.c
@@ -50,8 +50,18 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port);
static int mxc_audmux_v1_init(void)
{
- if (cpu_is_mx27() || cpu_is_mx21())
- audmux_base = IO_ADDRESS(AUDMUX_BASE_ADDR);
+#ifdef CONFIG_MACH_MX21
+ if (cpu_is_mx21())
+ audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR);
+ else
+#endif
+#ifdef CONFIG_MACH_MX27
+ if (cpu_is_mx27())
+ audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR);
+ else
+#endif
+ (void)0;
+
return 0;
}