diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 08:20:35 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:44:39 -0500 |
commit | 509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6 (patch) | |
tree | 71bd04ef9f65aa70541f4d70e96d562bb8dfaf77 /arch/arm/plat-mxc/time.c | |
parent | d28b116b9239b603f790a5ed6f0c5fe329561b49 (diff) |
ARM: mxc: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-mxc/time.c')
-rw-r--r-- | arch/arm/plat-mxc/time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c index f9a1b059a76c..9f0c2610595e 100644 --- a/arch/arm/plat-mxc/time.c +++ b/arch/arm/plat-mxc/time.c | |||
@@ -120,7 +120,6 @@ static struct clocksource clocksource_mxc = { | |||
120 | .rating = 200, | 120 | .rating = 200, |
121 | .read = mx1_2_get_cycles, | 121 | .read = mx1_2_get_cycles, |
122 | .mask = CLOCKSOURCE_MASK(32), | 122 | .mask = CLOCKSOURCE_MASK(32), |
123 | .shift = 20, | ||
124 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 123 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
125 | }; | 124 | }; |
126 | 125 | ||
@@ -131,9 +130,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk) | |||
131 | if (timer_is_v2()) | 130 | if (timer_is_v2()) |
132 | clocksource_mxc.read = v2_get_cycles; | 131 | clocksource_mxc.read = v2_get_cycles; |
133 | 132 | ||
134 | clocksource_mxc.mult = clocksource_hz2mult(c, | 133 | clocksource_register_hz(&clocksource_mxc, c); |
135 | clocksource_mxc.shift); | ||
136 | clocksource_register(&clocksource_mxc); | ||
137 | 134 | ||
138 | return 0; | 135 | return 0; |
139 | } | 136 | } |