From: Mahesh Mahadevan <r9aadq@freescale.com>
Date: Tue, 25 Oct 2011 15:20:14 +0000 (-0500)
Subject: ENGR00160847 Update AUDMUX driver for MX6Q
X-Git-Tag: v3.0.35-fsl_4.1.0~2173
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d974ea79d7b751e5841c9f4f2e3880e1649e2e0f;p=karo-tx-linux.git

ENGR00160847 Update AUDMUX driver for MX6Q

Add protection to ensure code runs on MX6Q only

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 c0f978800253..c7270196718d 100644
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ b/arch/arm/plat-mxc/audmux-v2.c
@@ -189,8 +189,10 @@ 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;
+	if (cpu_is_mx6q()) {
+		audmux_base = MX6_IO_ADDRESS(MX6Q_AUDMUX_BASE_ADDR);
+		ret = 0;
+	}
 #endif
 #if defined(CONFIG_ARCH_MX5)
 	if (cpu_is_mx51()) {