diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-04 15:25:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-04 15:25:12 +0200 |
| commit | 47d237e58aa3574fad44b580487d7d44694fcaf4 (patch) | |
| tree | b51b172cede66d38975692234e9baebce58bb405 /arch/arm/mach-imx/clocksource.c | |
| parent | 94de405d8f56aa66283d7497c707380762440601 (diff) | |
| parent | 5d62bd0e678318d3290ad112d18c6335f5f68750 (diff) | |
| download | barebox-47d237e58aa3574fad44b580487d7d44694fcaf4.tar.gz barebox-47d237e58aa3574fad44b580487d7d44694fcaf4.tar.xz | |
Merge branch 'for-next/fixes'
Diffstat (limited to 'arch/arm/mach-imx/clocksource.c')
| -rw-r--r-- | arch/arm/mach-imx/clocksource.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c index 5fa6201174..69a688c09d 100644 --- a/arch/arm/mach-imx/clocksource.c +++ b/arch/arm/mach-imx/clocksource.c @@ -43,8 +43,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 */ static struct clk *clk_gpt; @@ -56,12 +57,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; |