commit 51918075d74978d6ca6ec14c81f55938f24108a2
author Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Fri Feb 12 22:38:31 2010 +0100
committer Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Wed Feb 24 10:06:59 2010 +0100
tree 54e2a03e19bc8e9be1f1e9add5b950c8cddebcf8
parent 6574305b0ed32f286dcebd653a2f3ba4e421f06c

arm/imx/audmux-v1: use SoC-prefixed names

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

arch/arm/plat-mxc/audmux-v1.c

diff --git a/arch/arm/plat-mxc/audmux-v1.c b/arch/arm/plat-mxc/audmux-v1.c
index da6387d..b62917c 100644
--- a/arch/arm/plat-mxc/audmux-v1.c
+++ b/arch/arm/plat-mxc/audmux-v1.c
@@ -50,8 +50,18 @@
 
 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;
 }