From: Tony Lin <tony.lin@freescale.com>
Date: Fri, 10 Feb 2012 09:06:21 +0000 (+0800)
Subject: ENGR00174232 [mx6q perfmon]PDM No. TKT055916: remove workaround for TO1.1
X-Git-Tag: v3.0.35-fsl~1495
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff74b0d6e62bf2f9a533c8a435ed787932cd7b96;p=karo-tx-linux.git

ENGR00174232 [mx6q perfmon]PDM No. TKT055916: remove workaround for TO1.1

remove the workaround
For TO1.0: bit16 of GPR11 must be set to enable perfmon
For TO1.1 and later: bit0 of GPR11 is enable bit for perfmon.
                     set 1/0 to enable/disable perfmon

add workaround for mx6dl

Signed-off-by: Tony Lin <tony.lin@freescale.com>
---

diff --git a/arch/arm/plat-mxc/devices/platform-imx-perfmon.c b/arch/arm/plat-mxc/devices/platform-imx-perfmon.c
index 25d1bf582de2..518322a8ab66 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-perfmon.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-perfmon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -86,8 +86,11 @@ static void platform_perfmon_init(void)
 	if (init)
 		return;
 
-	/* GPR11 bit[16] is the clock enable bit for perfmon */
-	mxc_iomux_set_gpr_register(11, 16, 1, 1);
+	if (mx6q_revision() == IMX_CHIP_REVISION_1_0)
+		/* GPR11 bit[16] must be set for TO1.0, it's a bug */
+		mxc_iomux_set_gpr_register(11, 16, 1, 1);
+
+	mxc_iomux_set_gpr_register(11, 0, 1, 1);
 	init = true;
 }
 
@@ -96,8 +99,7 @@ static void platform_perfmon_exit(void)
 	if (!init)
 		return;
 
-	/* GPR11 bit[16] is the clock enable bit for perfmon */
-	mxc_iomux_set_gpr_register(11, 16, 1, 0);
+	mxc_iomux_set_gpr_register(11, 0, 1, 0);
 	init = false;
 }