sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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 <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2012-09-26 11:35:11 +02:00
parent 638e059aba
commit e3e2ebb3ad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-imx/clocksource.c
View File

@ -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;