diff --git a/[refs] b/[refs]
index 1d92408ee0f6..dbd13982d522 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e3e7afe9bd73cc3fe0d742ba3391e864e234923
+refs/heads/master: 4c8b581dd28588940a328632e406baab574e0ce5
diff --git a/trunk/arch/arm/plat-mxc/audmux-v1.c b/trunk/arch/arm/plat-mxc/audmux-v1.c
index 70ab5aff2b9e..da6387dcdf21 100644
--- a/trunk/arch/arm/plat-mxc/audmux-v1.c
+++ b/trunk/arch/arm/plat-mxc/audmux-v1.c
@@ -28,7 +28,9 @@
 
 static void __iomem *audmux_base;
 
-#define MXC_AUDMUX_V1_PCR(x)	((x) * 4)
+static unsigned char port_mapping[] = {
+	0x0, 0x4, 0x8, 0x10, 0x14, 0x1c,
+};
 
 int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr)
 {
@@ -37,7 +39,10 @@ int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr)
 		return -ENOSYS;
 	}
 
-	writel(pcr, audmux_base + MXC_AUDMUX_V1_PCR(port));
+	if (port >= ARRAY_SIZE(port_mapping))
+		return -EINVAL;
+
+	writel(pcr, audmux_base + port_mapping[port]);
 
 	return 0;
 }