ENGR00160794 Update AUDMUX driver for MX6Q

Update the AUDMUX driver for MX6Q support

Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>

diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
index 175e3647bb27aa54273bfbc1e1673568e1568bba..c0f978800253bbb267bd8e05af65aa16aeaf8ce7 100644 (file)
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ b/arch/arm/plat-mxc/audmux-v2.c
@@ -187,6 +187,11 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);
 static int mxc_audmux_v2_init(void)
 {
        int ret;
+
+#if defined(CONFIG_ARCH_MX6)
+       audmux_base = MX6_IO_ADDRESS(MX6Q_AUDMUX_BASE_ADDR);
+       ret = 0;
+#endif
 #if defined(CONFIG_ARCH_MX5)
        if (cpu_is_mx51()) {
                audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);

diff --git a/arch/arm/plat-mxc/include/mach/mx6.h b/arch/arm/plat-mxc/include/mach/mx6.h
index 9103e9d13ff91edb45726aeb0f48b389b6cc101b..284c529f56c41a042ee7fc91ed16688a682d161f 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx6.h
+++ b/arch/arm/plat-mxc/include/mach/mx6.h
@@ -221,7 +221,7 @@
 #define IP2APB_PERFMON3_BASE_ADDR       (AIPS2_OFF_BASE_ADDR + 0x4C000)
 #define IP2APB_TZASC1_BASE_ADDR         (AIPS2_OFF_BASE_ADDR + 0x50000)
 #define IP2APB_TZASC2_BASE_ADDR         (AIPS2_OFF_BASE_ADDR + 0x54000)
-#define AUDMUX_BASE_ADDR                (AIPS2_OFF_BASE_ADDR + 0x58000)
+#define MX6Q_AUDMUX_BASE_ADDR           (AIPS2_OFF_BASE_ADDR + 0x58000)
 #define MIPI_CSI2_BASE_ADDR             (AIPS2_OFF_BASE_ADDR + 0x5C000)
 #define MIPI_DSI_BASE_ADDR              (AIPS2_OFF_BASE_ADDR + 0x60000)
 #define VDOA_BASE_ADDR                  (AIPS2_OFF_BASE_ADDR + 0x64000)