diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-11-07 17:47:12 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-11-07 17:47:12 -0700 |
| commit | 6a3d3ca944e31e3abb7ddeea9c0b8290300fbf5a (patch) | |
| tree | 360394a351a0ec99633b87cf7de0d2bb5ce81058 | |
| parent | 830eb5ad87e552d4118a20aa9287c036f285dc99 (diff) | |
i.MX6: fix GPT timing for TO 1.0
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | arch/arm/mach-mx6/clock.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index 7d0e93f1e22a..48d399966103 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -2057,8 +2057,10 @@ static unsigned long _clk_gpt_get_rate(struct clk *clk) { unsigned long rate; +#ifdef wantbadclock if (mx6q_revision() == IMX_CHIP_REVISION_1_0) return clk_get_rate(clk->parent); +#endif rate = mx6_timer_rate(); if (!rate) @@ -5541,14 +5543,9 @@ int __init mx6_clocks_init(unsigned long ckil, unsigned long osc, * the WAIT routines use GPT counter as * a delay. */ - if (mx6q_revision() == IMX_CHIP_REVISION_1_0) { - gpt_clk[0].parent = &ipg_perclk; - gpt_clk[0].get_rate = NULL; - } else { - /* Here we use OSC 24M as GPT's clock source, no need to - enable gpt serial clock*/ - gpt_clk[0].secondary = NULL; - } + /* Here we use OSC 24M as GPT's clock source, no need to + enable gpt serial clock*/ + gpt_clk[0].secondary = NULL; mxc_timer_init(&gpt_clk[0], timer_base, MXC_INT_GPT); |