diff options
| author | Tony Lin <tony.lin@freescale.com> | 2012-02-10 17:06:21 +0800 |
|---|---|---|
| committer | Tony Lin <tony.lin@freescale.com> | 2012-02-10 18:46:32 +0800 |
| commit | 6d86f4a4804773749ccaa872145abc77129ac4d3 (patch) | |
| tree | 74d72ae8364a1f25e183478aae103b77d0b5262f /arch | |
| parent | 8d8037bd64fa94fce2be6c45a76a21f821af0c57 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-perfmon.c | 12 |
1 files changed, 7 insertions, 5 deletions
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; } |