diff options
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/epit.c | 5 | ||||
-rw-r--r-- | arch/arm/plat-mxc/time.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/plat-mxc/epit.c b/arch/arm/plat-mxc/epit.c index ee9582f4972e..d69d343ff61f 100644 --- a/arch/arm/plat-mxc/epit.c +++ b/arch/arm/plat-mxc/epit.c | |||
@@ -93,7 +93,6 @@ static struct clocksource clocksource_epit = { | |||
93 | .rating = 200, | 93 | .rating = 200, |
94 | .read = epit_read, | 94 | .read = epit_read, |
95 | .mask = CLOCKSOURCE_MASK(32), | 95 | .mask = CLOCKSOURCE_MASK(32), |
96 | .shift = 20, | ||
97 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 96 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
98 | }; | 97 | }; |
99 | 98 | ||
@@ -101,9 +100,7 @@ static int __init epit_clocksource_init(struct clk *timer_clk) | |||
101 | { | 100 | { |
102 | unsigned int c = clk_get_rate(timer_clk); | 101 | unsigned int c = clk_get_rate(timer_clk); |
103 | 102 | ||
104 | clocksource_epit.mult = clocksource_hz2mult(c, | 103 | clocksource_register_hz(&clocksource_epit, c); |
105 | clocksource_epit.shift); | ||
106 | clocksource_register(&clocksource_epit); | ||
107 | 104 | ||
108 | return 0; | 105 | return 0; |
109 | } | 106 | } |
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 | } |