aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-29 04:25:03 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-03-29 04:25:03 -0400
commit4dc50a068ad8fbbd2dd6dd5ac8ac2652589ba046 (patch)
treed3c3eab18ba28f794c713d2e9de19ecb49c6b808 /arch/sh/kernel/cpu
parent0776d602abe61871d27accd8e3bcb225a96f4a9f (diff)
sh: Kill off timer clock strings for legacy CPG parts.
Now with the lookup aliases in place there is no longer any need to provide the clock string, kill it off for all legacy CPG CPUs. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu')
-rw-r--r--arch/sh/kernel/cpu/sh2/setup-sh7619.c2
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-mxg.c3
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7201.c3
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7203.c4
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7206.c5
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7705.c3
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh770x.c3
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7710.c3
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7720.c8
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh4-202.c3
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh7750.c5
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh7760.c3
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7757.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7763.c6
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7770.c9
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7780.c6
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-shx3.c6
-rw-r--r--arch/sh/kernel/cpu/sh5/setup-sh5.c3
18 files changed, 0 insertions, 77 deletions
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index 9b96457ccc7b..c3638516bffc 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -130,7 +130,6 @@ static struct platform_device eth_device = {
130static struct sh_timer_config cmt0_platform_data = { 130static struct sh_timer_config cmt0_platform_data = {
131 .channel_offset = 0x02, 131 .channel_offset = 0x02,
132 .timer_bit = 0, 132 .timer_bit = 0,
133 .clk = "peripheral_clk",
134 .clockevent_rating = 125, 133 .clockevent_rating = 125,
135 .clocksource_rating = 0, /* disabled due to code generation issues */ 134 .clocksource_rating = 0, /* disabled due to code generation issues */
136}; 135};
@@ -160,7 +159,6 @@ static struct platform_device cmt0_device = {
160static struct sh_timer_config cmt1_platform_data = { 159static struct sh_timer_config cmt1_platform_data = {
161 .channel_offset = 0x08, 160 .channel_offset = 0x08,
162 .timer_bit = 1, 161 .timer_bit = 1,
163 .clk = "peripheral_clk",
164 .clockevent_rating = 125, 162 .clockevent_rating = 125,
165 .clocksource_rating = 0, /* disabled due to code generation issues */ 163 .clocksource_rating = 0, /* disabled due to code generation issues */
166}; 164};
diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
index 5301450656cc..6c96ea02bf8d 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
@@ -117,7 +117,6 @@ static DECLARE_INTC_DESC(intc_desc, "mxg", vectors, groups,
117static struct sh_timer_config mtu2_0_platform_data = { 117static struct sh_timer_config mtu2_0_platform_data = {
118 .channel_offset = -0x80, 118 .channel_offset = -0x80,
119 .timer_bit = 0, 119 .timer_bit = 0,
120 .clk = "peripheral_clk",
121 .clockevent_rating = 200, 120 .clockevent_rating = 200,
122}; 121};
123 122
@@ -146,7 +145,6 @@ static struct platform_device mtu2_0_device = {
146static struct sh_timer_config mtu2_1_platform_data = { 145static struct sh_timer_config mtu2_1_platform_data = {
147 .channel_offset = -0x100, 146 .channel_offset = -0x100,
148 .timer_bit = 1, 147 .timer_bit = 1,
149 .clk = "peripheral_clk",
150 .clockevent_rating = 200, 148 .clockevent_rating = 200,
151}; 149};
152 150
@@ -175,7 +173,6 @@ static struct platform_device mtu2_1_device = {
175static struct sh_timer_config mtu2_2_platform_data = { 173static struct sh_timer_config mtu2_2_platform_data = {
176 .channel_offset = 0x80, 174 .channel_offset = 0x80,
177 .timer_bit = 2, 175 .timer_bit = 2,
178 .clk = "peripheral_clk",
179 .clockevent_rating = 200, 176 .clockevent_rating = 200,
180}; 177};
181 178
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
index 5b07ab57acfd..d08bf4c07d60 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
@@ -320,7 +320,6 @@ static struct platform_device rtc_device = {
320static struct sh_timer_config mtu2_0_platform_data = { 320static struct sh_timer_config mtu2_0_platform_data = {
321 .channel_offset = -0x80, 321 .channel_offset = -0x80,
322 .timer_bit = 0, 322 .timer_bit = 0,
323 .clk = "peripheral_clk",
324 .clockevent_rating = 200, 323 .clockevent_rating = 200,
325}; 324};
326 325
@@ -349,7 +348,6 @@ static struct platform_device mtu2_0_device = {
349static struct sh_timer_config mtu2_1_platform_data = { 348static struct sh_timer_config mtu2_1_platform_data = {
350 .channel_offset = -0x100, 349 .channel_offset = -0x100,
351 .timer_bit = 1, 350 .timer_bit = 1,
352 .clk = "peripheral_clk",
353 .clockevent_rating = 200, 351 .clockevent_rating = 200,
354}; 352};
355 353
@@ -378,7 +376,6 @@ static struct platform_device mtu2_1_device = {
378static struct sh_timer_config mtu2_2_platform_data = { 376static struct sh_timer_config mtu2_2_platform_data = {
379 .channel_offset = 0x80, 377 .channel_offset = 0x80,
380 .timer_bit = 2, 378 .timer_bit = 2,
381 .clk = "peripheral_clk",
382 .clockevent_rating = 200, 379 .clockevent_rating = 200,
383}; 380};
384 381
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index 433ac5301314..832f401b5860 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -236,7 +236,6 @@ static struct platform_device scif3_device = {
236static struct sh_timer_config cmt0_platform_data = { 236static struct sh_timer_config cmt0_platform_data = {
237 .channel_offset = 0x02, 237 .channel_offset = 0x02,
238 .timer_bit = 0, 238 .timer_bit = 0,
239 .clk = "peripheral_clk",
240 .clockevent_rating = 125, 239 .clockevent_rating = 125,
241 .clocksource_rating = 0, /* disabled due to code generation issues */ 240 .clocksource_rating = 0, /* disabled due to code generation issues */
242}; 241};
@@ -266,7 +265,6 @@ static struct platform_device cmt0_device = {
266static struct sh_timer_config cmt1_platform_data = { 265static struct sh_timer_config cmt1_platform_data = {
267 .channel_offset = 0x08, 266 .channel_offset = 0x08,
268 .timer_bit = 1, 267 .timer_bit = 1,
269 .clk = "peripheral_clk",
270 .clockevent_rating = 125, 268 .clockevent_rating = 125,
271 .clocksource_rating = 0, /* disabled due to code generation issues */ 269 .clocksource_rating = 0, /* disabled due to code generation issues */
272}; 270};
@@ -296,7 +294,6 @@ static struct platform_device cmt1_device = {
296static struct sh_timer_config mtu2_0_platform_data = { 294static struct sh_timer_config mtu2_0_platform_data = {
297 .channel_offset = -0x80, 295 .channel_offset = -0x80,
298 .timer_bit = 0, 296 .timer_bit = 0,
299 .clk = "peripheral_clk",
300 .clockevent_rating = 200, 297 .clockevent_rating = 200,
301}; 298};
302 299
@@ -325,7 +322,6 @@ static struct platform_device mtu2_0_device = {
325static struct sh_timer_config mtu2_1_platform_data = { 322static struct sh_timer_config mtu2_1_platform_data = {
326 .channel_offset = -0x100, 323 .channel_offset = -0x100,
327 .timer_bit = 1, 324 .timer_bit = 1,
328 .clk = "peripheral_clk",
329 .clockevent_rating = 200, 325 .clockevent_rating = 200,
330}; 326};
331 327
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index 8caecb41e4e6..dc47b04e1049 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -196,7 +196,6 @@ static struct platform_device scif3_device = {
196static struct sh_timer_config cmt0_platform_data = { 196static struct sh_timer_config cmt0_platform_data = {
197 .channel_offset = 0x02, 197 .channel_offset = 0x02,
198 .timer_bit = 0, 198 .timer_bit = 0,
199 .clk = "peripheral_clk",
200 .clockevent_rating = 125, 199 .clockevent_rating = 125,
201 .clocksource_rating = 0, /* disabled due to code generation issues */ 200 .clocksource_rating = 0, /* disabled due to code generation issues */
202}; 201};
@@ -226,7 +225,6 @@ static struct platform_device cmt0_device = {
226static struct sh_timer_config cmt1_platform_data = { 225static struct sh_timer_config cmt1_platform_data = {
227 .channel_offset = 0x08, 226 .channel_offset = 0x08,
228 .timer_bit = 1, 227 .timer_bit = 1,
229 .clk = "peripheral_clk",
230 .clockevent_rating = 125, 228 .clockevent_rating = 125,
231 .clocksource_rating = 0, /* disabled due to code generation issues */ 229 .clocksource_rating = 0, /* disabled due to code generation issues */
232}; 230};
@@ -256,7 +254,6 @@ static struct platform_device cmt1_device = {
256static struct sh_timer_config mtu2_0_platform_data = { 254static struct sh_timer_config mtu2_0_platform_data = {
257 .channel_offset = -0x80, 255 .channel_offset = -0x80,
258 .timer_bit = 0, 256 .timer_bit = 0,
259 .clk = "peripheral_clk",
260 .clockevent_rating = 200, 257 .clockevent_rating = 200,
261}; 258};
262 259
@@ -285,7 +282,6 @@ static struct platform_device mtu2_0_device = {
285static struct sh_timer_config mtu2_1_platform_data = { 282static struct sh_timer_config mtu2_1_platform_data = {
286 .channel_offset = -0x100, 283 .channel_offset = -0x100,
287 .timer_bit = 1, 284 .timer_bit = 1,
288 .clk = "peripheral_clk",
289 .clockevent_rating = 200, 285 .clockevent_rating = 200,
290}; 286};
291 287
@@ -314,7 +310,6 @@ static struct platform_device mtu2_1_device = {
314static struct sh_timer_config mtu2_2_platform_data = { 310static struct sh_timer_config mtu2_2_platform_data = {
315 .channel_offset = 0x80, 311 .channel_offset = 0x80,
316 .timer_bit = 2, 312 .timer_bit = 2,
317 .clk = "peripheral_clk",
318 .clockevent_rating = 200, 313 .clockevent_rating = 200,
319}; 314};
320 315
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index 5e45fb7338fd..baadd7f54d94 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -126,7 +126,6 @@ static struct platform_device rtc_device = {
126static struct sh_timer_config tmu0_platform_data = { 126static struct sh_timer_config tmu0_platform_data = {
127 .channel_offset = 0x02, 127 .channel_offset = 0x02,
128 .timer_bit = 0, 128 .timer_bit = 0,
129 .clk = "peripheral_clk",
130 .clockevent_rating = 200, 129 .clockevent_rating = 200,
131}; 130};
132 131
@@ -155,7 +154,6 @@ static struct platform_device tmu0_device = {
155static struct sh_timer_config tmu1_platform_data = { 154static struct sh_timer_config tmu1_platform_data = {
156 .channel_offset = 0xe, 155 .channel_offset = 0xe,
157 .timer_bit = 1, 156 .timer_bit = 1,
158 .clk = "peripheral_clk",
159 .clocksource_rating = 200, 157 .clocksource_rating = 200,
160}; 158};
161 159
@@ -184,7 +182,6 @@ static struct platform_device tmu1_device = {
184static struct sh_timer_config tmu2_platform_data = { 182static struct sh_timer_config tmu2_platform_data = {
185 .channel_offset = 0x1a, 183 .channel_offset = 0x1a,
186 .timer_bit = 2, 184 .timer_bit = 2,
187 .clk = "peripheral_clk",
188}; 185};
189 186
190static struct resource tmu2_resources[] = { 187static struct resource tmu2_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
index 9adb853a9184..3cf8c8ef7b32 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
@@ -159,7 +159,6 @@ static struct platform_device scif2_device = {
159static struct sh_timer_config tmu0_platform_data = { 159static struct sh_timer_config tmu0_platform_data = {
160 .channel_offset = 0x02, 160 .channel_offset = 0x02,
161 .timer_bit = 0, 161 .timer_bit = 0,
162 .clk = "peripheral_clk",
163 .clockevent_rating = 200, 162 .clockevent_rating = 200,
164}; 163};
165 164
@@ -188,7 +187,6 @@ static struct platform_device tmu0_device = {
188static struct sh_timer_config tmu1_platform_data = { 187static struct sh_timer_config tmu1_platform_data = {
189 .channel_offset = 0xe, 188 .channel_offset = 0xe,
190 .timer_bit = 1, 189 .timer_bit = 1,
191 .clk = "peripheral_clk",
192 .clocksource_rating = 200, 190 .clocksource_rating = 200,
193}; 191};
194 192
@@ -217,7 +215,6 @@ static struct platform_device tmu1_device = {
217static struct sh_timer_config tmu2_platform_data = { 215static struct sh_timer_config tmu2_platform_data = {
218 .channel_offset = 0x1a, 216 .channel_offset = 0x1a,
219 .timer_bit = 2, 217 .timer_bit = 2,
220 .clk = "peripheral_clk",
221}; 218};
222 219
223static struct resource tmu2_resources[] = { 220static struct resource tmu2_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 2e581e30d13d..b0c2fb4ab479 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -129,7 +129,6 @@ static struct platform_device scif1_device = {
129static struct sh_timer_config tmu0_platform_data = { 129static struct sh_timer_config tmu0_platform_data = {
130 .channel_offset = 0x02, 130 .channel_offset = 0x02,
131 .timer_bit = 0, 131 .timer_bit = 0,
132 .clk = "peripheral_clk",
133 .clockevent_rating = 200, 132 .clockevent_rating = 200,
134}; 133};
135 134
@@ -158,7 +157,6 @@ static struct platform_device tmu0_device = {
158static struct sh_timer_config tmu1_platform_data = { 157static struct sh_timer_config tmu1_platform_data = {
159 .channel_offset = 0xe, 158 .channel_offset = 0xe,
160 .timer_bit = 1, 159 .timer_bit = 1,
161 .clk = "peripheral_clk",
162 .clocksource_rating = 200, 160 .clocksource_rating = 200,
163}; 161};
164 162
@@ -187,7 +185,6 @@ static struct platform_device tmu1_device = {
187static struct sh_timer_config tmu2_platform_data = { 185static struct sh_timer_config tmu2_platform_data = {
188 .channel_offset = 0x1a, 186 .channel_offset = 0x1a,
189 .timer_bit = 2, 187 .timer_bit = 2,
190 .clk = "peripheral_clk",
191}; 188};
192 189
193static struct resource tmu2_resources[] = { 190static struct resource tmu2_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
index 9a006e13b41d..24b17135d5d2 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@ -132,7 +132,6 @@ static struct platform_device usbf_device = {
132static struct sh_timer_config cmt0_platform_data = { 132static struct sh_timer_config cmt0_platform_data = {
133 .channel_offset = 0x10, 133 .channel_offset = 0x10,
134 .timer_bit = 0, 134 .timer_bit = 0,
135 .clk = "peripheral_clk",
136 .clockevent_rating = 125, 135 .clockevent_rating = 125,
137 .clocksource_rating = 125, 136 .clocksource_rating = 125,
138}; 137};
@@ -162,7 +161,6 @@ static struct platform_device cmt0_device = {
162static struct sh_timer_config cmt1_platform_data = { 161static struct sh_timer_config cmt1_platform_data = {
163 .channel_offset = 0x20, 162 .channel_offset = 0x20,
164 .timer_bit = 1, 163 .timer_bit = 1,
165 .clk = "peripheral_clk",
166}; 164};
167 165
168static struct resource cmt1_resources[] = { 166static struct resource cmt1_resources[] = {
@@ -190,7 +188,6 @@ static struct platform_device cmt1_device = {
190static struct sh_timer_config cmt2_platform_data = { 188static struct sh_timer_config cmt2_platform_data = {
191 .channel_offset = 0x30, 189 .channel_offset = 0x30,
192 .timer_bit = 2, 190 .timer_bit = 2,
193 .clk = "peripheral_clk",
194}; 191};
195 192
196static struct resource cmt2_resources[] = { 193static struct resource cmt2_resources[] = {
@@ -218,7 +215,6 @@ static struct platform_device cmt2_device = {
218static struct sh_timer_config cmt3_platform_data = { 215static struct sh_timer_config cmt3_platform_data = {
219 .channel_offset = 0x40, 216 .channel_offset = 0x40,
220 .timer_bit = 3, 217 .timer_bit = 3,
221 .clk = "peripheral_clk",
222}; 218};
223 219
224static struct resource cmt3_resources[] = { 220static struct resource cmt3_resources[] = {
@@ -246,7 +242,6 @@ static struct platform_device cmt3_device = {
246static struct sh_timer_config cmt4_platform_data = { 242static struct sh_timer_config cmt4_platform_data = {
247 .channel_offset = 0x50, 243 .channel_offset = 0x50,
248 .timer_bit = 4, 244 .timer_bit = 4,
249 .clk = "peripheral_clk",
250}; 245};
251 246
252static struct resource cmt4_resources[] = { 247static struct resource cmt4_resources[] = {
@@ -274,7 +269,6 @@ static struct platform_device cmt4_device = {
274static struct sh_timer_config tmu0_platform_data = { 269static struct sh_timer_config tmu0_platform_data = {
275 .channel_offset = 0x02, 270 .channel_offset = 0x02,
276 .timer_bit = 0, 271 .timer_bit = 0,
277 .clk = "peripheral_clk",
278 .clockevent_rating = 200, 272 .clockevent_rating = 200,
279}; 273};
280 274
@@ -303,7 +297,6 @@ static struct platform_device tmu0_device = {
303static struct sh_timer_config tmu1_platform_data = { 297static struct sh_timer_config tmu1_platform_data = {
304 .channel_offset = 0xe, 298 .channel_offset = 0xe,
305 .timer_bit = 1, 299 .timer_bit = 1,
306 .clk = "peripheral_clk",
307 .clocksource_rating = 200, 300 .clocksource_rating = 200,
308}; 301};
309 302
@@ -332,7 +325,6 @@ static struct platform_device tmu1_device = {
332static struct sh_timer_config tmu2_platform_data = { 325static struct sh_timer_config tmu2_platform_data = {
333 .channel_offset = 0x1a, 326 .channel_offset = 0x1a,
334 .timer_bit = 2, 327 .timer_bit = 2,
335 .clk = "peripheral_clk",
336}; 328};
337 329
338static struct resource tmu2_resources[] = { 330static struct resource tmu2_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
index 223d06657775..e916b18e1f7c 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
@@ -33,7 +33,6 @@ static struct platform_device scif0_device = {
33static struct sh_timer_config tmu0_platform_data = { 33static struct sh_timer_config tmu0_platform_data = {
34 .channel_offset = 0x04, 34 .channel_offset = 0x04,
35 .timer_bit = 0, 35 .timer_bit = 0,
36 .clk = "peripheral_clk",
37 .clockevent_rating = 200, 36 .clockevent_rating = 200,
38}; 37};
39 38
@@ -62,7 +61,6 @@ static struct platform_device tmu0_device = {
62static struct sh_timer_config tmu1_platform_data = { 61static struct sh_timer_config tmu1_platform_data = {
63 .channel_offset = 0x10, 62 .channel_offset = 0x10,
64 .timer_bit = 1, 63 .timer_bit = 1,
65 .clk = "peripheral_clk",
66 .clocksource_rating = 200, 64 .clocksource_rating = 200,
67}; 65};
68 66
@@ -91,7 +89,6 @@ static struct platform_device tmu1_device = {
91static struct sh_timer_config tmu2_platform_data = { 89static struct sh_timer_config tmu2_platform_data = {
92 .channel_offset = 0x1c, 90 .channel_offset = 0x1c,
93 .timer_bit = 2, 91 .timer_bit = 2,
94 .clk = "peripheral_clk",
95}; 92};
96 93
97static struct resource tmu2_resources[] = { 94static struct resource tmu2_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index 2f337b143c8f..911d196e86b5 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -68,7 +68,6 @@ static struct platform_device scif1_device = {
68static struct sh_timer_config tmu0_platform_data = { 68static struct sh_timer_config tmu0_platform_data = {
69 .channel_offset = 0x04, 69 .channel_offset = 0x04,
70 .timer_bit = 0, 70 .timer_bit = 0,
71 .clk = "peripheral_clk",
72 .clockevent_rating = 200, 71 .clockevent_rating = 200,
73}; 72};
74 73
@@ -97,7 +96,6 @@ static struct platform_device tmu0_device = {
97static struct sh_timer_config tmu1_platform_data = { 96static struct sh_timer_config tmu1_platform_data = {
98 .channel_offset = 0x10, 97 .channel_offset = 0x10,
99 .timer_bit = 1, 98 .timer_bit = 1,
100 .clk = "peripheral_clk",
101 .clocksource_rating = 200, 99 .clocksource_rating = 200,
102}; 100};
103 101
@@ -126,7 +124,6 @@ static struct platform_device tmu1_device = {
126static struct sh_timer_config tmu2_platform_data = { 124static struct sh_timer_config tmu2_platform_data = {
127 .channel_offset = 0x1c, 125 .channel_offset = 0x1c,
128 .timer_bit = 2, 126 .timer_bit = 2,
129 .clk = "peripheral_clk",
130}; 127};
131 128
132static struct resource tmu2_resources[] = { 129static struct resource tmu2_resources[] = {
@@ -159,7 +156,6 @@ static struct platform_device tmu2_device = {
159static struct sh_timer_config tmu3_platform_data = { 156static struct sh_timer_config tmu3_platform_data = {
160 .channel_offset = 0x04, 157 .channel_offset = 0x04,
161 .timer_bit = 0, 158 .timer_bit = 0,
162 .clk = "peripheral_clk",
163}; 159};
164 160
165static struct resource tmu3_resources[] = { 161static struct resource tmu3_resources[] = {
@@ -187,7 +183,6 @@ static struct platform_device tmu3_device = {
187static struct sh_timer_config tmu4_platform_data = { 183static struct sh_timer_config tmu4_platform_data = {
188 .channel_offset = 0x10, 184 .channel_offset = 0x10,
189 .timer_bit = 1, 185 .timer_bit = 1,
190 .clk = "peripheral_clk",
191}; 186};
192 187
193static struct resource tmu4_resources[] = { 188static struct resource tmu4_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index fa43da0502bd..48ea8fe85dc5 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -189,7 +189,6 @@ static struct platform_device scif3_device = {
189static struct sh_timer_config tmu0_platform_data = { 189static struct sh_timer_config tmu0_platform_data = {
190 .channel_offset = 0x04, 190 .channel_offset = 0x04,
191 .timer_bit = 0, 191 .timer_bit = 0,
192 .clk = "peripheral_clk",
193 .clockevent_rating = 200, 192 .clockevent_rating = 200,
194}; 193};
195 194
@@ -218,7 +217,6 @@ static struct platform_device tmu0_device = {
218static struct sh_timer_config tmu1_platform_data = { 217static struct sh_timer_config tmu1_platform_data = {
219 .channel_offset = 0x10, 218 .channel_offset = 0x10,
220 .timer_bit = 1, 219 .timer_bit = 1,
221 .clk = "peripheral_clk",
222 .clocksource_rating = 200, 220 .clocksource_rating = 200,
223}; 221};
224 222
@@ -247,7 +245,6 @@ static struct platform_device tmu1_device = {
247static struct sh_timer_config tmu2_platform_data = { 245static struct sh_timer_config tmu2_platform_data = {
248 .channel_offset = 0x1c, 246 .channel_offset = 0x1c,
249 .timer_bit = 2, 247 .timer_bit = 2,
250 .clk = "peripheral_clk",
251}; 248};
252 249
253static struct resource tmu2_resources[] = { 250static struct resource tmu2_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index 25eddf24f634..444aca95b20d 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -65,7 +65,6 @@ static struct platform_device scif4_device = {
65static struct sh_timer_config tmu0_platform_data = { 65static struct sh_timer_config tmu0_platform_data = {
66 .channel_offset = 0x04, 66 .channel_offset = 0x04,
67 .timer_bit = 0, 67 .timer_bit = 0,
68 .clk = "peripheral_clk",
69 .clockevent_rating = 200, 68 .clockevent_rating = 200,
70}; 69};
71 70
@@ -94,7 +93,6 @@ static struct platform_device tmu0_device = {
94static struct sh_timer_config tmu1_platform_data = { 93static struct sh_timer_config tmu1_platform_data = {
95 .channel_offset = 0x10, 94 .channel_offset = 0x10,
96 .timer_bit = 1, 95 .timer_bit = 1,
97 .clk = "peripheral_clk",
98 .clocksource_rating = 200, 96 .clocksource_rating = 200,
99}; 97};
100 98
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index a91263e0358b..5b5f6b005fc5 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -133,7 +133,6 @@ static struct platform_device usbf_device = {
133static struct sh_timer_config tmu0_platform_data = { 133static struct sh_timer_config tmu0_platform_data = {
134 .channel_offset = 0x04, 134 .channel_offset = 0x04,
135 .timer_bit = 0, 135 .timer_bit = 0,
136 .clk = "peripheral_clk",
137 .clockevent_rating = 200, 136 .clockevent_rating = 200,
138}; 137};
139 138
@@ -162,7 +161,6 @@ static struct platform_device tmu0_device = {
162static struct sh_timer_config tmu1_platform_data = { 161static struct sh_timer_config tmu1_platform_data = {
163 .channel_offset = 0x10, 162 .channel_offset = 0x10,
164 .timer_bit = 1, 163 .timer_bit = 1,
165 .clk = "peripheral_clk",
166 .clocksource_rating = 200, 164 .clocksource_rating = 200,
167}; 165};
168 166
@@ -191,7 +189,6 @@ static struct platform_device tmu1_device = {
191static struct sh_timer_config tmu2_platform_data = { 189static struct sh_timer_config tmu2_platform_data = {
192 .channel_offset = 0x1c, 190 .channel_offset = 0x1c,
193 .timer_bit = 2, 191 .timer_bit = 2,
194 .clk = "peripheral_clk",
195}; 192};
196 193
197static struct resource tmu2_resources[] = { 194static struct resource tmu2_resources[] = {
@@ -219,7 +216,6 @@ static struct platform_device tmu2_device = {
219static struct sh_timer_config tmu3_platform_data = { 216static struct sh_timer_config tmu3_platform_data = {
220 .channel_offset = 0x04, 217 .channel_offset = 0x04,
221 .timer_bit = 0, 218 .timer_bit = 0,
222 .clk = "peripheral_clk",
223}; 219};
224 220
225static struct resource tmu3_resources[] = { 221static struct resource tmu3_resources[] = {
@@ -247,7 +243,6 @@ static struct platform_device tmu3_device = {
247static struct sh_timer_config tmu4_platform_data = { 243static struct sh_timer_config tmu4_platform_data = {
248 .channel_offset = 0x10, 244 .channel_offset = 0x10,
249 .timer_bit = 1, 245 .timer_bit = 1,
250 .clk = "peripheral_clk",
251}; 246};
252 247
253static struct resource tmu4_resources[] = { 248static struct resource tmu4_resources[] = {
@@ -275,7 +270,6 @@ static struct platform_device tmu4_device = {
275static struct sh_timer_config tmu5_platform_data = { 270static struct sh_timer_config tmu5_platform_data = {
276 .channel_offset = 0x1c, 271 .channel_offset = 0x1c,
277 .timer_bit = 2, 272 .timer_bit = 2,
278 .clk = "peripheral_clk",
279}; 273};
280 274
281static struct resource tmu5_resources[] = { 275static struct resource tmu5_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
index 83a27b0e4ed2..7270d7fd6761 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
@@ -167,7 +167,6 @@ static struct platform_device scif9_device = {
167static struct sh_timer_config tmu0_platform_data = { 167static struct sh_timer_config tmu0_platform_data = {
168 .channel_offset = 0x04, 168 .channel_offset = 0x04,
169 .timer_bit = 0, 169 .timer_bit = 0,
170 .clk = "peripheral_clk",
171 .clockevent_rating = 200, 170 .clockevent_rating = 200,
172}; 171};
173 172
@@ -196,7 +195,6 @@ static struct platform_device tmu0_device = {
196static struct sh_timer_config tmu1_platform_data = { 195static struct sh_timer_config tmu1_platform_data = {
197 .channel_offset = 0x10, 196 .channel_offset = 0x10,
198 .timer_bit = 1, 197 .timer_bit = 1,
199 .clk = "peripheral_clk",
200 .clocksource_rating = 200, 198 .clocksource_rating = 200,
201}; 199};
202 200
@@ -225,7 +223,6 @@ static struct platform_device tmu1_device = {
225static struct sh_timer_config tmu2_platform_data = { 223static struct sh_timer_config tmu2_platform_data = {
226 .channel_offset = 0x1c, 224 .channel_offset = 0x1c,
227 .timer_bit = 2, 225 .timer_bit = 2,
228 .clk = "peripheral_clk",
229}; 226};
230 227
231static struct resource tmu2_resources[] = { 228static struct resource tmu2_resources[] = {
@@ -253,7 +250,6 @@ static struct platform_device tmu2_device = {
253static struct sh_timer_config tmu3_platform_data = { 250static struct sh_timer_config tmu3_platform_data = {
254 .channel_offset = 0x04, 251 .channel_offset = 0x04,
255 .timer_bit = 0, 252 .timer_bit = 0,
256 .clk = "peripheral_clk",
257}; 253};
258 254
259static struct resource tmu3_resources[] = { 255static struct resource tmu3_resources[] = {
@@ -281,7 +277,6 @@ static struct platform_device tmu3_device = {
281static struct sh_timer_config tmu4_platform_data = { 277static struct sh_timer_config tmu4_platform_data = {
282 .channel_offset = 0x10, 278 .channel_offset = 0x10,
283 .timer_bit = 1, 279 .timer_bit = 1,
284 .clk = "peripheral_clk",
285}; 280};
286 281
287static struct resource tmu4_resources[] = { 282static struct resource tmu4_resources[] = {
@@ -309,7 +304,6 @@ static struct platform_device tmu4_device = {
309static struct sh_timer_config tmu5_platform_data = { 304static struct sh_timer_config tmu5_platform_data = {
310 .channel_offset = 0x1c, 305 .channel_offset = 0x1c,
311 .timer_bit = 2, 306 .timer_bit = 2,
312 .clk = "peripheral_clk",
313}; 307};
314 308
315static struct resource tmu5_resources[] = { 309static struct resource tmu5_resources[] = {
@@ -337,7 +331,6 @@ static struct platform_device tmu5_device = {
337static struct sh_timer_config tmu6_platform_data = { 331static struct sh_timer_config tmu6_platform_data = {
338 .channel_offset = 0x04, 332 .channel_offset = 0x04,
339 .timer_bit = 0, 333 .timer_bit = 0,
340 .clk = "peripheral_clk",
341}; 334};
342 335
343static struct resource tmu6_resources[] = { 336static struct resource tmu6_resources[] = {
@@ -365,7 +358,6 @@ static struct platform_device tmu6_device = {
365static struct sh_timer_config tmu7_platform_data = { 358static struct sh_timer_config tmu7_platform_data = {
366 .channel_offset = 0x10, 359 .channel_offset = 0x10,
367 .timer_bit = 1, 360 .timer_bit = 1,
368 .clk = "peripheral_clk",
369}; 361};
370 362
371static struct resource tmu7_resources[] = { 363static struct resource tmu7_resources[] = {
@@ -393,7 +385,6 @@ static struct platform_device tmu7_device = {
393static struct sh_timer_config tmu8_platform_data = { 385static struct sh_timer_config tmu8_platform_data = {
394 .channel_offset = 0x1c, 386 .channel_offset = 0x1c,
395 .timer_bit = 2, 387 .timer_bit = 2,
396 .clk = "peripheral_clk",
397}; 388};
398 389
399static struct resource tmu8_resources[] = { 390static struct resource tmu8_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index f7c48e92b95b..05fc38df1582 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -51,7 +51,6 @@ static struct platform_device scif1_device = {
51static struct sh_timer_config tmu0_platform_data = { 51static struct sh_timer_config tmu0_platform_data = {
52 .channel_offset = 0x04, 52 .channel_offset = 0x04,
53 .timer_bit = 0, 53 .timer_bit = 0,
54 .clk = "peripheral_clk",
55 .clockevent_rating = 200, 54 .clockevent_rating = 200,
56}; 55};
57 56
@@ -80,7 +79,6 @@ static struct platform_device tmu0_device = {
80static struct sh_timer_config tmu1_platform_data = { 79static struct sh_timer_config tmu1_platform_data = {
81 .channel_offset = 0x10, 80 .channel_offset = 0x10,
82 .timer_bit = 1, 81 .timer_bit = 1,
83 .clk = "peripheral_clk",
84 .clocksource_rating = 200, 82 .clocksource_rating = 200,
85}; 83};
86 84
@@ -109,7 +107,6 @@ static struct platform_device tmu1_device = {
109static struct sh_timer_config tmu2_platform_data = { 107static struct sh_timer_config tmu2_platform_data = {
110 .channel_offset = 0x1c, 108 .channel_offset = 0x1c,
111 .timer_bit = 2, 109 .timer_bit = 2,
112 .clk = "peripheral_clk",
113}; 110};
114 111
115static struct resource tmu2_resources[] = { 112static struct resource tmu2_resources[] = {
@@ -137,7 +134,6 @@ static struct platform_device tmu2_device = {
137static struct sh_timer_config tmu3_platform_data = { 134static struct sh_timer_config tmu3_platform_data = {
138 .channel_offset = 0x04, 135 .channel_offset = 0x04,
139 .timer_bit = 0, 136 .timer_bit = 0,
140 .clk = "peripheral_clk",
141}; 137};
142 138
143static struct resource tmu3_resources[] = { 139static struct resource tmu3_resources[] = {
@@ -165,7 +161,6 @@ static struct platform_device tmu3_device = {
165static struct sh_timer_config tmu4_platform_data = { 161static struct sh_timer_config tmu4_platform_data = {
166 .channel_offset = 0x10, 162 .channel_offset = 0x10,
167 .timer_bit = 1, 163 .timer_bit = 1,
168 .clk = "peripheral_clk",
169}; 164};
170 165
171static struct resource tmu4_resources[] = { 166static struct resource tmu4_resources[] = {
@@ -193,7 +188,6 @@ static struct platform_device tmu4_device = {
193static struct sh_timer_config tmu5_platform_data = { 188static struct sh_timer_config tmu5_platform_data = {
194 .channel_offset = 0x1c, 189 .channel_offset = 0x1c,
195 .timer_bit = 2, 190 .timer_bit = 2,
196 .clk = "peripheral_clk",
197}; 191};
198 192
199static struct resource tmu5_resources[] = { 193static struct resource tmu5_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index ba545b5ccc15..9158bc5ea38b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -72,7 +72,6 @@ static struct platform_device scif2_device = {
72static struct sh_timer_config tmu0_platform_data = { 72static struct sh_timer_config tmu0_platform_data = {
73 .channel_offset = 0x04, 73 .channel_offset = 0x04,
74 .timer_bit = 0, 74 .timer_bit = 0,
75 .clk = "peripheral_clk",
76 .clockevent_rating = 200, 75 .clockevent_rating = 200,
77}; 76};
78 77
@@ -101,7 +100,6 @@ static struct platform_device tmu0_device = {
101static struct sh_timer_config tmu1_platform_data = { 100static struct sh_timer_config tmu1_platform_data = {
102 .channel_offset = 0x10, 101 .channel_offset = 0x10,
103 .timer_bit = 1, 102 .timer_bit = 1,
104 .clk = "peripheral_clk",
105 .clocksource_rating = 200, 103 .clocksource_rating = 200,
106}; 104};
107 105
@@ -130,7 +128,6 @@ static struct platform_device tmu1_device = {
130static struct sh_timer_config tmu2_platform_data = { 128static struct sh_timer_config tmu2_platform_data = {
131 .channel_offset = 0x1c, 129 .channel_offset = 0x1c,
132 .timer_bit = 2, 130 .timer_bit = 2,
133 .clk = "peripheral_clk",
134}; 131};
135 132
136static struct resource tmu2_resources[] = { 133static struct resource tmu2_resources[] = {
@@ -158,7 +155,6 @@ static struct platform_device tmu2_device = {
158static struct sh_timer_config tmu3_platform_data = { 155static struct sh_timer_config tmu3_platform_data = {
159 .channel_offset = 0x04, 156 .channel_offset = 0x04,
160 .timer_bit = 0, 157 .timer_bit = 0,
161 .clk = "peripheral_clk",
162}; 158};
163 159
164static struct resource tmu3_resources[] = { 160static struct resource tmu3_resources[] = {
@@ -186,7 +182,6 @@ static struct platform_device tmu3_device = {
186static struct sh_timer_config tmu4_platform_data = { 182static struct sh_timer_config tmu4_platform_data = {
187 .channel_offset = 0x10, 183 .channel_offset = 0x10,
188 .timer_bit = 1, 184 .timer_bit = 1,
189 .clk = "peripheral_clk",
190}; 185};
191 186
192static struct resource tmu4_resources[] = { 187static struct resource tmu4_resources[] = {
@@ -214,7 +209,6 @@ static struct platform_device tmu4_device = {
214static struct sh_timer_config tmu5_platform_data = { 209static struct sh_timer_config tmu5_platform_data = {
215 .channel_offset = 0x1c, 210 .channel_offset = 0x1c,
216 .timer_bit = 2, 211 .timer_bit = 2,
217 .clk = "peripheral_clk",
218}; 212};
219 213
220static struct resource tmu5_resources[] = { 214static struct resource tmu5_resources[] = {
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c
index c84ca204240b..d910666142b1 100644
--- a/arch/sh/kernel/cpu/sh5/setup-sh5.c
+++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c
@@ -70,7 +70,6 @@ static struct platform_device rtc_device = {
70static struct sh_timer_config tmu0_platform_data = { 70static struct sh_timer_config tmu0_platform_data = {
71 .channel_offset = 0x04, 71 .channel_offset = 0x04,
72 .timer_bit = 0, 72 .timer_bit = 0,
73 .clk = "peripheral_clk",
74 .clockevent_rating = 200, 73 .clockevent_rating = 200,
75}; 74};
76 75
@@ -99,7 +98,6 @@ static struct platform_device tmu0_device = {
99static struct sh_timer_config tmu1_platform_data = { 98static struct sh_timer_config tmu1_platform_data = {
100 .channel_offset = 0x10, 99 .channel_offset = 0x10,
101 .timer_bit = 1, 100 .timer_bit = 1,
102 .clk = "peripheral_clk",
103 .clocksource_rating = 200, 101 .clocksource_rating = 200,
104}; 102};
105 103
@@ -128,7 +126,6 @@ static struct platform_device tmu1_device = {
128static struct sh_timer_config tmu2_platform_data = { 126static struct sh_timer_config tmu2_platform_data = {
129 .channel_offset = 0x1c, 127 .channel_offset = 0x1c,
130 .timer_bit = 2, 128 .timer_bit = 2,
131 .clk = "peripheral_clk",
132}; 129};
133 130
134static struct resource tmu2_resources[] = { 131static struct resource tmu2_resources[] = {