diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2010-01-25 05:58:21 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-26 12:54:06 -0500 |
| commit | faed40665d2d81b7e0e537d14ef680ab3da9f22d (patch) | |
| tree | 506ddbba47af01284e0ea67b42578fdafd8a12d5 | |
| parent | 828df43f139c7fbf0d505c7b9a666d321a0f2c25 (diff) | |
mx25: fix time accounting
The gpt_clk rate function doesn't consider the PER divider. This causes a
significant drift in time accounting. Fix this by introducing the correct rate
calculation function.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-mx25/clock.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c index 08aaa38f1f1f..c003ac40f9a8 100644 --- a/arch/arm/mach-mx25/clock.c +++ b/arch/arm/mach-mx25/clock.c | |||
| @@ -119,6 +119,11 @@ static unsigned long get_rate_nfc(struct clk *clk) | |||
| 119 | return get_rate_per(8); | 119 | return get_rate_per(8); |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | static unsigned long get_rate_gpt(struct clk *clk) | ||
| 123 | { | ||
| 124 | return get_rate_per(5); | ||
| 125 | } | ||
| 126 | |||
| 122 | static unsigned long get_rate_otg(struct clk *clk) | 127 | static unsigned long get_rate_otg(struct clk *clk) |
| 123 | { | 128 | { |
| 124 | return 48000000; /* FIXME */ | 129 | return 48000000; /* FIXME */ |
| @@ -156,7 +161,7 @@ static void clk_cgcr_disable(struct clk *clk) | |||
| 156 | .secondary = s, \ | 161 | .secondary = s, \ |
| 157 | } | 162 | } |
| 158 | 163 | ||
| 159 | DEFINE_CLOCK(gpt_clk, 0, CCM_CGCR0, 5, get_rate_ipg, NULL, NULL); | 164 | DEFINE_CLOCK(gpt_clk, 0, CCM_CGCR0, 5, get_rate_gpt, NULL, NULL); |
| 160 | DEFINE_CLOCK(uart_per_clk, 0, CCM_CGCR0, 15, get_rate_uart, NULL, NULL); | 165 | DEFINE_CLOCK(uart_per_clk, 0, CCM_CGCR0, 15, get_rate_uart, NULL, NULL); |
| 161 | DEFINE_CLOCK(cspi1_clk, 0, CCM_CGCR1, 5, get_rate_ipg, NULL, NULL); | 166 | DEFINE_CLOCK(cspi1_clk, 0, CCM_CGCR1, 5, get_rate_ipg, NULL, NULL); |
| 162 | DEFINE_CLOCK(cspi2_clk, 0, CCM_CGCR1, 6, get_rate_ipg, NULL, NULL); | 167 | DEFINE_CLOCK(cspi2_clk, 0, CCM_CGCR1, 6, get_rate_ipg, NULL, NULL); |
