From e3e2ebb3ad55fd52e52028332cc72fd92c2214c7 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 26 Sep 2012 11:35:11 +0200 Subject: ARM i.MX clocksource: fix timer source selection - The i.MX1 timer does not have IPG clock as source, so rename the define accordingly - for the i.MX31 timer we want to use the per clock, not the ipg clock. Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/clocksource.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'arch/arm/mach-imx/clocksource.c') diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c index 2c6f6a08e6..6314f9fc20 100644 --- a/arch/arm/mach-imx/clocksource.c +++ b/arch/arm/mach-imx/clocksource.c @@ -42,8 +42,9 @@ #define TCTL_SWR (1 << 15) /* Software reset */ #define IMX1_TCTL_FRR (1 << 8) /* Freerun / restart */ #define IMX31_TCTL_FRR (1 << 9) /* Freerun / restart */ -#define IMX1_TCTL_CLKSOURCE_IPG (1 << 1) /* Clock source bit position */ +#define IMX1_TCTL_CLKSOURCE_PER (1 << 1) /* Clock source bit position */ #define IMX31_TCTL_CLKSOURCE_IPG (1 << 6) /* Clock source bit position */ +#define IMX31_TCTL_CLKSOURCE_PER (2 << 6) /* Clock source bit position */ #define TCTL_TEN (1 << 0) /* Timer enable */ struct imx_gpt_regs { @@ -53,12 +54,12 @@ struct imx_gpt_regs { static struct imx_gpt_regs regs_imx1 = { .tcn = 0x10, - .tctl_val = IMX1_TCTL_FRR | IMX1_TCTL_CLKSOURCE_IPG | TCTL_TEN, + .tctl_val = IMX1_TCTL_FRR | IMX1_TCTL_CLKSOURCE_PER | TCTL_TEN, }; static struct imx_gpt_regs regs_imx31 = { .tcn = 0x24, - .tctl_val = IMX31_TCTL_FRR | IMX31_TCTL_CLKSOURCE_IPG | TCTL_TEN, + .tctl_val = IMX31_TCTL_FRR | IMX31_TCTL_CLKSOURCE_PER | TCTL_TEN, }; static struct imx_gpt_regs *regs; -- cgit v1.2.3