Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[~andy/linux] / arch / arm / plat-mxc / audmux-v2.c

diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
index 25ad95ba92a43377136077841a4e7ecfd5e19e5c..0be1ac7f421b0ab2f5a244e5185cd23a5b792da2 100644 (file)
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ b/arch/arm/plat-mxc/audmux-v2.c
@@ -187,7 +187,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);
 static int mxc_audmux_v2_init(void)
 {
        int ret;
-
+#if defined(CONFIG_ARCH_MX5)
+       if (cpu_is_mx51()) {
+               audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);
+               ret = 0;
+               return ret;
+       }
+#endif
 #if defined(CONFIG_ARCH_MX3)
        if (cpu_is_mx31())
                audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);