diff options
| author | Richard Zhao <richard.zhao@linaro.org> | 2011-09-02 11:19:01 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-11-15 14:09:22 +0800 |
| commit | da2d882578eaa184c740bff97a92eaa6bf4b2b30 (patch) | |
| tree | 9982392c1abbdfe245268e08b3fb577585f068fb /arch | |
| parent | 183841f5190ab9dcbbc29ac6676dd335f3dc09ec (diff) | |
imx: timer: change parent to ipg_per
It must be consistent with clock.c
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-mxc/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c index 4b0fe285e83..dd6b74e378c 100644 --- a/arch/arm/plat-mxc/time.c +++ b/arch/arm/plat-mxc/time.c @@ -57,6 +57,7 @@ /* MX31, MX35, MX25, MX5 */ #define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */ #define V2_TCTL_CLK_IPG (1 << 6) +#define V2_TCTL_CLK_PER (2 << 6) #define V2_TCTL_FRR (1 << 9) #define V2_IR 0x0c #define V2_TSTAT 0x08 @@ -304,7 +305,7 @@ void __init mxc_timer_init(struct clk *timer_clk, void __iomem *base, int irq) __raw_writel(0, timer_base + MXC_TPRER); /* see datasheet note */ if (timer_is_v2()) - tctl_val = V2_TCTL_CLK_IPG | V2_TCTL_FRR | V2_TCTL_WAITEN | MXC_TCTL_TEN; + tctl_val = V2_TCTL_CLK_PER | V2_TCTL_FRR | V2_TCTL_WAITEN | MXC_TCTL_TEN; else tctl_val = MX1_2_TCTL_FRR | MX1_2_TCTL_CLK_PCLK1 | MXC_TCTL_TEN; |