aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-10 02:28:16 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-03-10 02:28:16 -0500
commitec0ffe2ee0e0fb9da4409d86bfd72636450f32df (patch)
tree75ec1d3de64fbadb5ebe5179926eb608dcfb81b6
parent214a607a4f5bf5a14dab0304ba350cdaf3916795 (diff)
sh: Kill off all timer name clobbering.
Now that dev_name() can be used early, we no longer require a static string. Kill off all of the superfluous timer names. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/cpu/sh2/setup-sh7619.c4
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-mxg.c6
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7201.c6
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7203.c8
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7206.c10
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7705.c6
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh770x.c6
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7710.c6
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7720.c16
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh4-202.c6
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh7750.c10
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh7760.c6
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7343.c8
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7366.c8
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7722.c8
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7723.c14
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7724.c14
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7757.c4
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7763.c12
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7770.c18
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7780.c12
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7785.c12
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7786.c24
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-shx3.c12
-rw-r--r--arch/sh/kernel/cpu/sh5/setup-sh5.c6
25 files changed, 0 insertions, 242 deletions
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index 114c7cee7184..9b96457ccc7b 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -128,7 +128,6 @@ static struct platform_device eth_device = {
128}; 128};
129 129
130static struct sh_timer_config cmt0_platform_data = { 130static struct sh_timer_config cmt0_platform_data = {
131 .name = "CMT0",
132 .channel_offset = 0x02, 131 .channel_offset = 0x02,
133 .timer_bit = 0, 132 .timer_bit = 0,
134 .clk = "peripheral_clk", 133 .clk = "peripheral_clk",
@@ -138,7 +137,6 @@ static struct sh_timer_config cmt0_platform_data = {
138 137
139static struct resource cmt0_resources[] = { 138static struct resource cmt0_resources[] = {
140 [0] = { 139 [0] = {
141 .name = "CMT0",
142 .start = 0xf84a0072, 140 .start = 0xf84a0072,
143 .end = 0xf84a0077, 141 .end = 0xf84a0077,
144 .flags = IORESOURCE_MEM, 142 .flags = IORESOURCE_MEM,
@@ -160,7 +158,6 @@ static struct platform_device cmt0_device = {
160}; 158};
161 159
162static struct sh_timer_config cmt1_platform_data = { 160static struct sh_timer_config cmt1_platform_data = {
163 .name = "CMT1",
164 .channel_offset = 0x08, 161 .channel_offset = 0x08,
165 .timer_bit = 1, 162 .timer_bit = 1,
166 .clk = "peripheral_clk", 163 .clk = "peripheral_clk",
@@ -170,7 +167,6 @@ static struct sh_timer_config cmt1_platform_data = {
170 167
171static struct resource cmt1_resources[] = { 168static struct resource cmt1_resources[] = {
172 [0] = { 169 [0] = {
173 .name = "CMT1",
174 .start = 0xf84a0078, 170 .start = 0xf84a0078,
175 .end = 0xf84a007d, 171 .end = 0xf84a007d,
176 .flags = IORESOURCE_MEM, 172 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
index 8f669dc9b0da..5301450656cc 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
@@ -115,7 +115,6 @@ static DECLARE_INTC_DESC(intc_desc, "mxg", vectors, groups,
115 mask_registers, prio_registers, NULL); 115 mask_registers, prio_registers, NULL);
116 116
117static struct sh_timer_config mtu2_0_platform_data = { 117static struct sh_timer_config mtu2_0_platform_data = {
118 .name = "MTU2_0",
119 .channel_offset = -0x80, 118 .channel_offset = -0x80,
120 .timer_bit = 0, 119 .timer_bit = 0,
121 .clk = "peripheral_clk", 120 .clk = "peripheral_clk",
@@ -124,7 +123,6 @@ static struct sh_timer_config mtu2_0_platform_data = {
124 123
125static struct resource mtu2_0_resources[] = { 124static struct resource mtu2_0_resources[] = {
126 [0] = { 125 [0] = {
127 .name = "MTU2_0",
128 .start = 0xff801300, 126 .start = 0xff801300,
129 .end = 0xff801326, 127 .end = 0xff801326,
130 .flags = IORESOURCE_MEM, 128 .flags = IORESOURCE_MEM,
@@ -146,7 +144,6 @@ static struct platform_device mtu2_0_device = {
146}; 144};
147 145
148static struct sh_timer_config mtu2_1_platform_data = { 146static struct sh_timer_config mtu2_1_platform_data = {
149 .name = "MTU2_1",
150 .channel_offset = -0x100, 147 .channel_offset = -0x100,
151 .timer_bit = 1, 148 .timer_bit = 1,
152 .clk = "peripheral_clk", 149 .clk = "peripheral_clk",
@@ -155,7 +152,6 @@ static struct sh_timer_config mtu2_1_platform_data = {
155 152
156static struct resource mtu2_1_resources[] = { 153static struct resource mtu2_1_resources[] = {
157 [0] = { 154 [0] = {
158 .name = "MTU2_1",
159 .start = 0xff801380, 155 .start = 0xff801380,
160 .end = 0xff801390, 156 .end = 0xff801390,
161 .flags = IORESOURCE_MEM, 157 .flags = IORESOURCE_MEM,
@@ -177,7 +173,6 @@ static struct platform_device mtu2_1_device = {
177}; 173};
178 174
179static struct sh_timer_config mtu2_2_platform_data = { 175static struct sh_timer_config mtu2_2_platform_data = {
180 .name = "MTU2_2",
181 .channel_offset = 0x80, 176 .channel_offset = 0x80,
182 .timer_bit = 2, 177 .timer_bit = 2,
183 .clk = "peripheral_clk", 178 .clk = "peripheral_clk",
@@ -186,7 +181,6 @@ static struct sh_timer_config mtu2_2_platform_data = {
186 181
187static struct resource mtu2_2_resources[] = { 182static struct resource mtu2_2_resources[] = {
188 [0] = { 183 [0] = {
189 .name = "MTU2_2",
190 .start = 0xff801000, 184 .start = 0xff801000,
191 .end = 0xff80100a, 185 .end = 0xff80100a,
192 .flags = IORESOURCE_MEM, 186 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
index 4ccfeb59eb1a..5b07ab57acfd 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
@@ -318,7 +318,6 @@ static struct platform_device rtc_device = {
318}; 318};
319 319
320static struct sh_timer_config mtu2_0_platform_data = { 320static struct sh_timer_config mtu2_0_platform_data = {
321 .name = "MTU2_0",
322 .channel_offset = -0x80, 321 .channel_offset = -0x80,
323 .timer_bit = 0, 322 .timer_bit = 0,
324 .clk = "peripheral_clk", 323 .clk = "peripheral_clk",
@@ -327,7 +326,6 @@ static struct sh_timer_config mtu2_0_platform_data = {
327 326
328static struct resource mtu2_0_resources[] = { 327static struct resource mtu2_0_resources[] = {
329 [0] = { 328 [0] = {
330 .name = "MTU2_0",
331 .start = 0xfffe4300, 329 .start = 0xfffe4300,
332 .end = 0xfffe4326, 330 .end = 0xfffe4326,
333 .flags = IORESOURCE_MEM, 331 .flags = IORESOURCE_MEM,
@@ -349,7 +347,6 @@ static struct platform_device mtu2_0_device = {
349}; 347};
350 348
351static struct sh_timer_config mtu2_1_platform_data = { 349static struct sh_timer_config mtu2_1_platform_data = {
352 .name = "MTU2_1",
353 .channel_offset = -0x100, 350 .channel_offset = -0x100,
354 .timer_bit = 1, 351 .timer_bit = 1,
355 .clk = "peripheral_clk", 352 .clk = "peripheral_clk",
@@ -358,7 +355,6 @@ static struct sh_timer_config mtu2_1_platform_data = {
358 355
359static struct resource mtu2_1_resources[] = { 356static struct resource mtu2_1_resources[] = {
360 [0] = { 357 [0] = {
361 .name = "MTU2_1",
362 .start = 0xfffe4380, 358 .start = 0xfffe4380,
363 .end = 0xfffe4390, 359 .end = 0xfffe4390,
364 .flags = IORESOURCE_MEM, 360 .flags = IORESOURCE_MEM,
@@ -380,7 +376,6 @@ static struct platform_device mtu2_1_device = {
380}; 376};
381 377
382static struct sh_timer_config mtu2_2_platform_data = { 378static struct sh_timer_config mtu2_2_platform_data = {
383 .name = "MTU2_2",
384 .channel_offset = 0x80, 379 .channel_offset = 0x80,
385 .timer_bit = 2, 380 .timer_bit = 2,
386 .clk = "peripheral_clk", 381 .clk = "peripheral_clk",
@@ -389,7 +384,6 @@ static struct sh_timer_config mtu2_2_platform_data = {
389 384
390static struct resource mtu2_2_resources[] = { 385static struct resource mtu2_2_resources[] = {
391 [0] = { 386 [0] = {
392 .name = "MTU2_2",
393 .start = 0xfffe4000, 387 .start = 0xfffe4000,
394 .end = 0xfffe400a, 388 .end = 0xfffe400a,
395 .flags = IORESOURCE_MEM, 389 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index 3136966cc9b3..433ac5301314 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -234,7 +234,6 @@ static struct platform_device scif3_device = {
234}; 234};
235 235
236static struct sh_timer_config cmt0_platform_data = { 236static struct sh_timer_config cmt0_platform_data = {
237 .name = "CMT0",
238 .channel_offset = 0x02, 237 .channel_offset = 0x02,
239 .timer_bit = 0, 238 .timer_bit = 0,
240 .clk = "peripheral_clk", 239 .clk = "peripheral_clk",
@@ -244,7 +243,6 @@ static struct sh_timer_config cmt0_platform_data = {
244 243
245static struct resource cmt0_resources[] = { 244static struct resource cmt0_resources[] = {
246 [0] = { 245 [0] = {
247 .name = "CMT0",
248 .start = 0xfffec002, 246 .start = 0xfffec002,
249 .end = 0xfffec007, 247 .end = 0xfffec007,
250 .flags = IORESOURCE_MEM, 248 .flags = IORESOURCE_MEM,
@@ -266,7 +264,6 @@ static struct platform_device cmt0_device = {
266}; 264};
267 265
268static struct sh_timer_config cmt1_platform_data = { 266static struct sh_timer_config cmt1_platform_data = {
269 .name = "CMT1",
270 .channel_offset = 0x08, 267 .channel_offset = 0x08,
271 .timer_bit = 1, 268 .timer_bit = 1,
272 .clk = "peripheral_clk", 269 .clk = "peripheral_clk",
@@ -276,7 +273,6 @@ static struct sh_timer_config cmt1_platform_data = {
276 273
277static struct resource cmt1_resources[] = { 274static struct resource cmt1_resources[] = {
278 [0] = { 275 [0] = {
279 .name = "CMT1",
280 .start = 0xfffec008, 276 .start = 0xfffec008,
281 .end = 0xfffec00d, 277 .end = 0xfffec00d,
282 .flags = IORESOURCE_MEM, 278 .flags = IORESOURCE_MEM,
@@ -298,7 +294,6 @@ static struct platform_device cmt1_device = {
298}; 294};
299 295
300static struct sh_timer_config mtu2_0_platform_data = { 296static struct sh_timer_config mtu2_0_platform_data = {
301 .name = "MTU2_0",
302 .channel_offset = -0x80, 297 .channel_offset = -0x80,
303 .timer_bit = 0, 298 .timer_bit = 0,
304 .clk = "peripheral_clk", 299 .clk = "peripheral_clk",
@@ -307,7 +302,6 @@ static struct sh_timer_config mtu2_0_platform_data = {
307 302
308static struct resource mtu2_0_resources[] = { 303static struct resource mtu2_0_resources[] = {
309 [0] = { 304 [0] = {
310 .name = "MTU2_0",
311 .start = 0xfffe4300, 305 .start = 0xfffe4300,
312 .end = 0xfffe4326, 306 .end = 0xfffe4326,
313 .flags = IORESOURCE_MEM, 307 .flags = IORESOURCE_MEM,
@@ -329,7 +323,6 @@ static struct platform_device mtu2_0_device = {
329}; 323};
330 324
331static struct sh_timer_config mtu2_1_platform_data = { 325static struct sh_timer_config mtu2_1_platform_data = {
332 .name = "MTU2_1",
333 .channel_offset = -0x100, 326 .channel_offset = -0x100,
334 .timer_bit = 1, 327 .timer_bit = 1,
335 .clk = "peripheral_clk", 328 .clk = "peripheral_clk",
@@ -338,7 +331,6 @@ static struct sh_timer_config mtu2_1_platform_data = {
338 331
339static struct resource mtu2_1_resources[] = { 332static struct resource mtu2_1_resources[] = {
340 [0] = { 333 [0] = {
341 .name = "MTU2_1",
342 .start = 0xfffe4380, 334 .start = 0xfffe4380,
343 .end = 0xfffe4390, 335 .end = 0xfffe4390,
344 .flags = IORESOURCE_MEM, 336 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index 064873585a8b..8caecb41e4e6 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -194,7 +194,6 @@ static struct platform_device scif3_device = {
194}; 194};
195 195
196static struct sh_timer_config cmt0_platform_data = { 196static struct sh_timer_config cmt0_platform_data = {
197 .name = "CMT0",
198 .channel_offset = 0x02, 197 .channel_offset = 0x02,
199 .timer_bit = 0, 198 .timer_bit = 0,
200 .clk = "peripheral_clk", 199 .clk = "peripheral_clk",
@@ -204,7 +203,6 @@ static struct sh_timer_config cmt0_platform_data = {
204 203
205static struct resource cmt0_resources[] = { 204static struct resource cmt0_resources[] = {
206 [0] = { 205 [0] = {
207 .name = "CMT0",
208 .start = 0xfffec002, 206 .start = 0xfffec002,
209 .end = 0xfffec007, 207 .end = 0xfffec007,
210 .flags = IORESOURCE_MEM, 208 .flags = IORESOURCE_MEM,
@@ -226,7 +224,6 @@ static struct platform_device cmt0_device = {
226}; 224};
227 225
228static struct sh_timer_config cmt1_platform_data = { 226static struct sh_timer_config cmt1_platform_data = {
229 .name = "CMT1",
230 .channel_offset = 0x08, 227 .channel_offset = 0x08,
231 .timer_bit = 1, 228 .timer_bit = 1,
232 .clk = "peripheral_clk", 229 .clk = "peripheral_clk",
@@ -236,7 +233,6 @@ static struct sh_timer_config cmt1_platform_data = {
236 233
237static struct resource cmt1_resources[] = { 234static struct resource cmt1_resources[] = {
238 [0] = { 235 [0] = {
239 .name = "CMT1",
240 .start = 0xfffec008, 236 .start = 0xfffec008,
241 .end = 0xfffec00d, 237 .end = 0xfffec00d,
242 .flags = IORESOURCE_MEM, 238 .flags = IORESOURCE_MEM,
@@ -258,7 +254,6 @@ static struct platform_device cmt1_device = {
258}; 254};
259 255
260static struct sh_timer_config mtu2_0_platform_data = { 256static struct sh_timer_config mtu2_0_platform_data = {
261 .name = "MTU2_0",
262 .channel_offset = -0x80, 257 .channel_offset = -0x80,
263 .timer_bit = 0, 258 .timer_bit = 0,
264 .clk = "peripheral_clk", 259 .clk = "peripheral_clk",
@@ -267,7 +262,6 @@ static struct sh_timer_config mtu2_0_platform_data = {
267 262
268static struct resource mtu2_0_resources[] = { 263static struct resource mtu2_0_resources[] = {
269 [0] = { 264 [0] = {
270 .name = "MTU2_0",
271 .start = 0xfffe4300, 265 .start = 0xfffe4300,
272 .end = 0xfffe4326, 266 .end = 0xfffe4326,
273 .flags = IORESOURCE_MEM, 267 .flags = IORESOURCE_MEM,
@@ -289,7 +283,6 @@ static struct platform_device mtu2_0_device = {
289}; 283};
290 284
291static struct sh_timer_config mtu2_1_platform_data = { 285static struct sh_timer_config mtu2_1_platform_data = {
292 .name = "MTU2_1",
293 .channel_offset = -0x100, 286 .channel_offset = -0x100,
294 .timer_bit = 1, 287 .timer_bit = 1,
295 .clk = "peripheral_clk", 288 .clk = "peripheral_clk",
@@ -298,7 +291,6 @@ static struct sh_timer_config mtu2_1_platform_data = {
298 291
299static struct resource mtu2_1_resources[] = { 292static struct resource mtu2_1_resources[] = {
300 [0] = { 293 [0] = {
301 .name = "MTU2_1",
302 .start = 0xfffe4380, 294 .start = 0xfffe4380,
303 .end = 0xfffe4390, 295 .end = 0xfffe4390,
304 .flags = IORESOURCE_MEM, 296 .flags = IORESOURCE_MEM,
@@ -320,7 +312,6 @@ static struct platform_device mtu2_1_device = {
320}; 312};
321 313
322static struct sh_timer_config mtu2_2_platform_data = { 314static struct sh_timer_config mtu2_2_platform_data = {
323 .name = "MTU2_2",
324 .channel_offset = 0x80, 315 .channel_offset = 0x80,
325 .timer_bit = 2, 316 .timer_bit = 2,
326 .clk = "peripheral_clk", 317 .clk = "peripheral_clk",
@@ -329,7 +320,6 @@ static struct sh_timer_config mtu2_2_platform_data = {
329 320
330static struct resource mtu2_2_resources[] = { 321static struct resource mtu2_2_resources[] = {
331 [0] = { 322 [0] = {
332 .name = "MTU2_2",
333 .start = 0xfffe4000, 323 .start = 0xfffe4000,
334 .end = 0xfffe400a, 324 .end = 0xfffe400a,
335 .flags = IORESOURCE_MEM, 325 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index 7b892d60e3a0..5e45fb7338fd 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -124,7 +124,6 @@ static struct platform_device rtc_device = {
124}; 124};
125 125
126static struct sh_timer_config tmu0_platform_data = { 126static struct sh_timer_config tmu0_platform_data = {
127 .name = "TMU0",
128 .channel_offset = 0x02, 127 .channel_offset = 0x02,
129 .timer_bit = 0, 128 .timer_bit = 0,
130 .clk = "peripheral_clk", 129 .clk = "peripheral_clk",
@@ -133,7 +132,6 @@ static struct sh_timer_config tmu0_platform_data = {
133 132
134static struct resource tmu0_resources[] = { 133static struct resource tmu0_resources[] = {
135 [0] = { 134 [0] = {
136 .name = "TMU0",
137 .start = 0xfffffe94, 135 .start = 0xfffffe94,
138 .end = 0xfffffe9f, 136 .end = 0xfffffe9f,
139 .flags = IORESOURCE_MEM, 137 .flags = IORESOURCE_MEM,
@@ -155,7 +153,6 @@ static struct platform_device tmu0_device = {
155}; 153};
156 154
157static struct sh_timer_config tmu1_platform_data = { 155static struct sh_timer_config tmu1_platform_data = {
158 .name = "TMU1",
159 .channel_offset = 0xe, 156 .channel_offset = 0xe,
160 .timer_bit = 1, 157 .timer_bit = 1,
161 .clk = "peripheral_clk", 158 .clk = "peripheral_clk",
@@ -164,7 +161,6 @@ static struct sh_timer_config tmu1_platform_data = {
164 161
165static struct resource tmu1_resources[] = { 162static struct resource tmu1_resources[] = {
166 [0] = { 163 [0] = {
167 .name = "TMU1",
168 .start = 0xfffffea0, 164 .start = 0xfffffea0,
169 .end = 0xfffffeab, 165 .end = 0xfffffeab,
170 .flags = IORESOURCE_MEM, 166 .flags = IORESOURCE_MEM,
@@ -186,7 +182,6 @@ static struct platform_device tmu1_device = {
186}; 182};
187 183
188static struct sh_timer_config tmu2_platform_data = { 184static struct sh_timer_config tmu2_platform_data = {
189 .name = "TMU2",
190 .channel_offset = 0x1a, 185 .channel_offset = 0x1a,
191 .timer_bit = 2, 186 .timer_bit = 2,
192 .clk = "peripheral_clk", 187 .clk = "peripheral_clk",
@@ -194,7 +189,6 @@ static struct sh_timer_config tmu2_platform_data = {
194 189
195static struct resource tmu2_resources[] = { 190static struct resource tmu2_resources[] = {
196 [0] = { 191 [0] = {
197 .name = "TMU2",
198 .start = 0xfffffeac, 192 .start = 0xfffffeac,
199 .end = 0xfffffebb, 193 .end = 0xfffffebb,
200 .flags = IORESOURCE_MEM, 194 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
index bc0c4f68c7c7..9adb853a9184 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
@@ -157,7 +157,6 @@ static struct platform_device scif2_device = {
157#endif 157#endif
158 158
159static struct sh_timer_config tmu0_platform_data = { 159static struct sh_timer_config tmu0_platform_data = {
160 .name = "TMU0",
161 .channel_offset = 0x02, 160 .channel_offset = 0x02,
162 .timer_bit = 0, 161 .timer_bit = 0,
163 .clk = "peripheral_clk", 162 .clk = "peripheral_clk",
@@ -166,7 +165,6 @@ static struct sh_timer_config tmu0_platform_data = {
166 165
167static struct resource tmu0_resources[] = { 166static struct resource tmu0_resources[] = {
168 [0] = { 167 [0] = {
169 .name = "TMU0",
170 .start = 0xfffffe94, 168 .start = 0xfffffe94,
171 .end = 0xfffffe9f, 169 .end = 0xfffffe9f,
172 .flags = IORESOURCE_MEM, 170 .flags = IORESOURCE_MEM,
@@ -188,7 +186,6 @@ static struct platform_device tmu0_device = {
188}; 186};
189 187
190static struct sh_timer_config tmu1_platform_data = { 188static struct sh_timer_config tmu1_platform_data = {
191 .name = "TMU1",
192 .channel_offset = 0xe, 189 .channel_offset = 0xe,
193 .timer_bit = 1, 190 .timer_bit = 1,
194 .clk = "peripheral_clk", 191 .clk = "peripheral_clk",
@@ -197,7 +194,6 @@ static struct sh_timer_config tmu1_platform_data = {
197 194
198static struct resource tmu1_resources[] = { 195static struct resource tmu1_resources[] = {
199 [0] = { 196 [0] = {
200 .name = "TMU1",
201 .start = 0xfffffea0, 197 .start = 0xfffffea0,
202 .end = 0xfffffeab, 198 .end = 0xfffffeab,
203 .flags = IORESOURCE_MEM, 199 .flags = IORESOURCE_MEM,
@@ -219,7 +215,6 @@ static struct platform_device tmu1_device = {
219}; 215};
220 216
221static struct sh_timer_config tmu2_platform_data = { 217static struct sh_timer_config tmu2_platform_data = {
222 .name = "TMU2",
223 .channel_offset = 0x1a, 218 .channel_offset = 0x1a,
224 .timer_bit = 2, 219 .timer_bit = 2,
225 .clk = "peripheral_clk", 220 .clk = "peripheral_clk",
@@ -227,7 +222,6 @@ static struct sh_timer_config tmu2_platform_data = {
227 222
228static struct resource tmu2_resources[] = { 223static struct resource tmu2_resources[] = {
229 [0] = { 224 [0] = {
230 .name = "TMU2",
231 .start = 0xfffffeac, 225 .start = 0xfffffeac,
232 .end = 0xfffffebb, 226 .end = 0xfffffebb,
233 .flags = IORESOURCE_MEM, 227 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 0845a3ad006d..2e581e30d13d 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -127,7 +127,6 @@ static struct platform_device scif1_device = {
127}; 127};
128 128
129static struct sh_timer_config tmu0_platform_data = { 129static struct sh_timer_config tmu0_platform_data = {
130 .name = "TMU0",
131 .channel_offset = 0x02, 130 .channel_offset = 0x02,
132 .timer_bit = 0, 131 .timer_bit = 0,
133 .clk = "peripheral_clk", 132 .clk = "peripheral_clk",
@@ -136,7 +135,6 @@ static struct sh_timer_config tmu0_platform_data = {
136 135
137static struct resource tmu0_resources[] = { 136static struct resource tmu0_resources[] = {
138 [0] = { 137 [0] = {
139 .name = "TMU0",
140 .start = 0xa412fe94, 138 .start = 0xa412fe94,
141 .end = 0xa412fe9f, 139 .end = 0xa412fe9f,
142 .flags = IORESOURCE_MEM, 140 .flags = IORESOURCE_MEM,
@@ -158,7 +156,6 @@ static struct platform_device tmu0_device = {
158}; 156};
159 157
160static struct sh_timer_config tmu1_platform_data = { 158static struct sh_timer_config tmu1_platform_data = {
161 .name = "TMU1",
162 .channel_offset = 0xe, 159 .channel_offset = 0xe,
163 .timer_bit = 1, 160 .timer_bit = 1,
164 .clk = "peripheral_clk", 161 .clk = "peripheral_clk",
@@ -167,7 +164,6 @@ static struct sh_timer_config tmu1_platform_data = {
167 164
168static struct resource tmu1_resources[] = { 165static struct resource tmu1_resources[] = {
169 [0] = { 166 [0] = {
170 .name = "TMU1",
171 .start = 0xa412fea0, 167 .start = 0xa412fea0,
172 .end = 0xa412feab, 168 .end = 0xa412feab,
173 .flags = IORESOURCE_MEM, 169 .flags = IORESOURCE_MEM,
@@ -189,7 +185,6 @@ static struct platform_device tmu1_device = {
189}; 185};
190 186
191static struct sh_timer_config tmu2_platform_data = { 187static struct sh_timer_config tmu2_platform_data = {
192 .name = "TMU2",
193 .channel_offset = 0x1a, 188 .channel_offset = 0x1a,
194 .timer_bit = 2, 189 .timer_bit = 2,
195 .clk = "peripheral_clk", 190 .clk = "peripheral_clk",
@@ -197,7 +192,6 @@ static struct sh_timer_config tmu2_platform_data = {
197 192
198static struct resource tmu2_resources[] = { 193static struct resource tmu2_resources[] = {
199 [0] = { 194 [0] = {
200 .name = "TMU2",
201 .start = 0xa412feac, 195 .start = 0xa412feac,
202 .end = 0xa412feb5, 196 .end = 0xa412feb5,
203 .flags = IORESOURCE_MEM, 197 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
index a718a6231091..9a006e13b41d 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@ -130,7 +130,6 @@ static struct platform_device usbf_device = {
130}; 130};
131 131
132static struct sh_timer_config cmt0_platform_data = { 132static struct sh_timer_config cmt0_platform_data = {
133 .name = "CMT0",
134 .channel_offset = 0x10, 133 .channel_offset = 0x10,
135 .timer_bit = 0, 134 .timer_bit = 0,
136 .clk = "peripheral_clk", 135 .clk = "peripheral_clk",
@@ -140,7 +139,6 @@ static struct sh_timer_config cmt0_platform_data = {
140 139
141static struct resource cmt0_resources[] = { 140static struct resource cmt0_resources[] = {
142 [0] = { 141 [0] = {
143 .name = "CMT0",
144 .start = 0x044a0010, 142 .start = 0x044a0010,
145 .end = 0x044a001b, 143 .end = 0x044a001b,
146 .flags = IORESOURCE_MEM, 144 .flags = IORESOURCE_MEM,
@@ -162,7 +160,6 @@ static struct platform_device cmt0_device = {
162}; 160};
163 161
164static struct sh_timer_config cmt1_platform_data = { 162static struct sh_timer_config cmt1_platform_data = {
165 .name = "CMT1",
166 .channel_offset = 0x20, 163 .channel_offset = 0x20,
167 .timer_bit = 1, 164 .timer_bit = 1,
168 .clk = "peripheral_clk", 165 .clk = "peripheral_clk",
@@ -170,7 +167,6 @@ static struct sh_timer_config cmt1_platform_data = {
170 167
171static struct resource cmt1_resources[] = { 168static struct resource cmt1_resources[] = {
172 [0] = { 169 [0] = {
173 .name = "CMT1",
174 .start = 0x044a0020, 170 .start = 0x044a0020,
175 .end = 0x044a002b, 171 .end = 0x044a002b,
176 .flags = IORESOURCE_MEM, 172 .flags = IORESOURCE_MEM,
@@ -192,7 +188,6 @@ static struct platform_device cmt1_device = {
192}; 188};
193 189
194static struct sh_timer_config cmt2_platform_data = { 190static struct sh_timer_config cmt2_platform_data = {
195 .name = "CMT2",
196 .channel_offset = 0x30, 191 .channel_offset = 0x30,
197 .timer_bit = 2, 192 .timer_bit = 2,
198 .clk = "peripheral_clk", 193 .clk = "peripheral_clk",
@@ -200,7 +195,6 @@ static struct sh_timer_config cmt2_platform_data = {
200 195
201static struct resource cmt2_resources[] = { 196static struct resource cmt2_resources[] = {
202 [0] = { 197 [0] = {
203 .name = "CMT2",
204 .start = 0x044a0030, 198 .start = 0x044a0030,
205 .end = 0x044a003b, 199 .end = 0x044a003b,
206 .flags = IORESOURCE_MEM, 200 .flags = IORESOURCE_MEM,
@@ -222,7 +216,6 @@ static struct platform_device cmt2_device = {
222}; 216};
223 217
224static struct sh_timer_config cmt3_platform_data = { 218static struct sh_timer_config cmt3_platform_data = {
225 .name = "CMT3",
226 .channel_offset = 0x40, 219 .channel_offset = 0x40,
227 .timer_bit = 3, 220 .timer_bit = 3,
228 .clk = "peripheral_clk", 221 .clk = "peripheral_clk",
@@ -230,7 +223,6 @@ static struct sh_timer_config cmt3_platform_data = {
230 223
231static struct resource cmt3_resources[] = { 224static struct resource cmt3_resources[] = {
232 [0] = { 225 [0] = {
233 .name = "CMT3",
234 .start = 0x044a0040, 226 .start = 0x044a0040,
235 .end = 0x044a004b, 227 .end = 0x044a004b,
236 .flags = IORESOURCE_MEM, 228 .flags = IORESOURCE_MEM,
@@ -252,7 +244,6 @@ static struct platform_device cmt3_device = {
252}; 244};
253 245
254static struct sh_timer_config cmt4_platform_data = { 246static struct sh_timer_config cmt4_platform_data = {
255 .name = "CMT4",
256 .channel_offset = 0x50, 247 .channel_offset = 0x50,
257 .timer_bit = 4, 248 .timer_bit = 4,
258 .clk = "peripheral_clk", 249 .clk = "peripheral_clk",
@@ -260,7 +251,6 @@ static struct sh_timer_config cmt4_platform_data = {
260 251
261static struct resource cmt4_resources[] = { 252static struct resource cmt4_resources[] = {
262 [0] = { 253 [0] = {
263 .name = "CMT4",
264 .start = 0x044a0050, 254 .start = 0x044a0050,
265 .end = 0x044a005b, 255 .end = 0x044a005b,
266 .flags = IORESOURCE_MEM, 256 .flags = IORESOURCE_MEM,
@@ -282,7 +272,6 @@ static struct platform_device cmt4_device = {
282}; 272};
283 273
284static struct sh_timer_config tmu0_platform_data = { 274static struct sh_timer_config tmu0_platform_data = {
285 .name = "TMU0",
286 .channel_offset = 0x02, 275 .channel_offset = 0x02,
287 .timer_bit = 0, 276 .timer_bit = 0,
288 .clk = "peripheral_clk", 277 .clk = "peripheral_clk",
@@ -291,7 +280,6 @@ static struct sh_timer_config tmu0_platform_data = {
291 280
292static struct resource tmu0_resources[] = { 281static struct resource tmu0_resources[] = {
293 [0] = { 282 [0] = {
294 .name = "TMU0",
295 .start = 0xa412fe94, 283 .start = 0xa412fe94,
296 .end = 0xa412fe9f, 284 .end = 0xa412fe9f,
297 .flags = IORESOURCE_MEM, 285 .flags = IORESOURCE_MEM,
@@ -313,7 +301,6 @@ static struct platform_device tmu0_device = {
313}; 301};
314 302
315static struct sh_timer_config tmu1_platform_data = { 303static struct sh_timer_config tmu1_platform_data = {
316 .name = "TMU1",
317 .channel_offset = 0xe, 304 .channel_offset = 0xe,
318 .timer_bit = 1, 305 .timer_bit = 1,
319 .clk = "peripheral_clk", 306 .clk = "peripheral_clk",
@@ -322,7 +309,6 @@ static struct sh_timer_config tmu1_platform_data = {
322 309
323static struct resource tmu1_resources[] = { 310static struct resource tmu1_resources[] = {
324 [0] = { 311 [0] = {
325 .name = "TMU1",
326 .start = 0xa412fea0, 312 .start = 0xa412fea0,
327 .end = 0xa412feab, 313 .end = 0xa412feab,
328 .flags = IORESOURCE_MEM, 314 .flags = IORESOURCE_MEM,
@@ -344,7 +330,6 @@ static struct platform_device tmu1_device = {
344}; 330};
345 331
346static struct sh_timer_config tmu2_platform_data = { 332static struct sh_timer_config tmu2_platform_data = {
347 .name = "TMU2",
348 .channel_offset = 0x1a, 333 .channel_offset = 0x1a,
349 .timer_bit = 2, 334 .timer_bit = 2,
350 .clk = "peripheral_clk", 335 .clk = "peripheral_clk",
@@ -352,7 +337,6 @@ static struct sh_timer_config tmu2_platform_data = {
352 337
353static struct resource tmu2_resources[] = { 338static struct resource tmu2_resources[] = {
354 [0] = { 339 [0] = {
355 .name = "TMU2",
356 .start = 0xa412feac, 340 .start = 0xa412feac,
357 .end = 0xa412feb5, 341 .end = 0xa412feb5,
358 .flags = IORESOURCE_MEM, 342 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
index b9b7e10ad68f..223d06657775 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
@@ -31,7 +31,6 @@ static struct platform_device scif0_device = {
31}; 31};
32 32
33static struct sh_timer_config tmu0_platform_data = { 33static struct sh_timer_config tmu0_platform_data = {
34 .name = "TMU0",
35 .channel_offset = 0x04, 34 .channel_offset = 0x04,
36 .timer_bit = 0, 35 .timer_bit = 0,
37 .clk = "peripheral_clk", 36 .clk = "peripheral_clk",
@@ -40,7 +39,6 @@ static struct sh_timer_config tmu0_platform_data = {
40 39
41static struct resource tmu0_resources[] = { 40static struct resource tmu0_resources[] = {
42 [0] = { 41 [0] = {
43 .name = "TMU0",
44 .start = 0xffd80008, 42 .start = 0xffd80008,
45 .end = 0xffd80013, 43 .end = 0xffd80013,
46 .flags = IORESOURCE_MEM, 44 .flags = IORESOURCE_MEM,
@@ -62,7 +60,6 @@ static struct platform_device tmu0_device = {
62}; 60};
63 61
64static struct sh_timer_config tmu1_platform_data = { 62static struct sh_timer_config tmu1_platform_data = {
65 .name = "TMU1",
66 .channel_offset = 0x10, 63 .channel_offset = 0x10,
67 .timer_bit = 1, 64 .timer_bit = 1,
68 .clk = "peripheral_clk", 65 .clk = "peripheral_clk",
@@ -71,7 +68,6 @@ static struct sh_timer_config tmu1_platform_data = {
71 68
72static struct resource tmu1_resources[] = { 69static struct resource tmu1_resources[] = {
73 [0] = { 70 [0] = {
74 .name = "TMU1",
75 .start = 0xffd80014, 71 .start = 0xffd80014,
76 .end = 0xffd8001f, 72 .end = 0xffd8001f,
77 .flags = IORESOURCE_MEM, 73 .flags = IORESOURCE_MEM,
@@ -93,7 +89,6 @@ static struct platform_device tmu1_device = {
93}; 89};
94 90
95static struct sh_timer_config tmu2_platform_data = { 91static struct sh_timer_config tmu2_platform_data = {
96 .name = "TMU2",
97 .channel_offset = 0x1c, 92 .channel_offset = 0x1c,
98 .timer_bit = 2, 93 .timer_bit = 2,
99 .clk = "peripheral_clk", 94 .clk = "peripheral_clk",
@@ -101,7 +96,6 @@ static struct sh_timer_config tmu2_platform_data = {
101 96
102static struct resource tmu2_resources[] = { 97static struct resource tmu2_resources[] = {
103 [0] = { 98 [0] = {
104 .name = "TMU2",
105 .start = 0xffd80020, 99 .start = 0xffd80020,
106 .end = 0xffd8002f, 100 .end = 0xffd8002f,
107 .flags = IORESOURCE_MEM, 101 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index ffd79e57254f..2f337b143c8f 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -66,7 +66,6 @@ static struct platform_device scif1_device = {
66}; 66};
67 67
68static struct sh_timer_config tmu0_platform_data = { 68static struct sh_timer_config tmu0_platform_data = {
69 .name = "TMU0",
70 .channel_offset = 0x04, 69 .channel_offset = 0x04,
71 .timer_bit = 0, 70 .timer_bit = 0,
72 .clk = "peripheral_clk", 71 .clk = "peripheral_clk",
@@ -75,7 +74,6 @@ static struct sh_timer_config tmu0_platform_data = {
75 74
76static struct resource tmu0_resources[] = { 75static struct resource tmu0_resources[] = {
77 [0] = { 76 [0] = {
78 .name = "TMU0",
79 .start = 0xffd80008, 77 .start = 0xffd80008,
80 .end = 0xffd80013, 78 .end = 0xffd80013,
81 .flags = IORESOURCE_MEM, 79 .flags = IORESOURCE_MEM,
@@ -97,7 +95,6 @@ static struct platform_device tmu0_device = {
97}; 95};
98 96
99static struct sh_timer_config tmu1_platform_data = { 97static struct sh_timer_config tmu1_platform_data = {
100 .name = "TMU1",
101 .channel_offset = 0x10, 98 .channel_offset = 0x10,
102 .timer_bit = 1, 99 .timer_bit = 1,
103 .clk = "peripheral_clk", 100 .clk = "peripheral_clk",
@@ -106,7 +103,6 @@ static struct sh_timer_config tmu1_platform_data = {
106 103
107static struct resource tmu1_resources[] = { 104static struct resource tmu1_resources[] = {
108 [0] = { 105 [0] = {
109 .name = "TMU1",
110 .start = 0xffd80014, 106 .start = 0xffd80014,
111 .end = 0xffd8001f, 107 .end = 0xffd8001f,
112 .flags = IORESOURCE_MEM, 108 .flags = IORESOURCE_MEM,
@@ -128,7 +124,6 @@ static struct platform_device tmu1_device = {
128}; 124};
129 125
130static struct sh_timer_config tmu2_platform_data = { 126static struct sh_timer_config tmu2_platform_data = {
131 .name = "TMU2",
132 .channel_offset = 0x1c, 127 .channel_offset = 0x1c,
133 .timer_bit = 2, 128 .timer_bit = 2,
134 .clk = "peripheral_clk", 129 .clk = "peripheral_clk",
@@ -136,7 +131,6 @@ static struct sh_timer_config tmu2_platform_data = {
136 131
137static struct resource tmu2_resources[] = { 132static struct resource tmu2_resources[] = {
138 [0] = { 133 [0] = {
139 .name = "TMU2",
140 .start = 0xffd80020, 134 .start = 0xffd80020,
141 .end = 0xffd8002f, 135 .end = 0xffd8002f,
142 .flags = IORESOURCE_MEM, 136 .flags = IORESOURCE_MEM,
@@ -163,7 +157,6 @@ static struct platform_device tmu2_device = {
163 defined(CONFIG_CPU_SUBTYPE_SH7751R) 157 defined(CONFIG_CPU_SUBTYPE_SH7751R)
164 158
165static struct sh_timer_config tmu3_platform_data = { 159static struct sh_timer_config tmu3_platform_data = {
166 .name = "TMU3",
167 .channel_offset = 0x04, 160 .channel_offset = 0x04,
168 .timer_bit = 0, 161 .timer_bit = 0,
169 .clk = "peripheral_clk", 162 .clk = "peripheral_clk",
@@ -171,7 +164,6 @@ static struct sh_timer_config tmu3_platform_data = {
171 164
172static struct resource tmu3_resources[] = { 165static struct resource tmu3_resources[] = {
173 [0] = { 166 [0] = {
174 .name = "TMU3",
175 .start = 0xfe100008, 167 .start = 0xfe100008,
176 .end = 0xfe100013, 168 .end = 0xfe100013,
177 .flags = IORESOURCE_MEM, 169 .flags = IORESOURCE_MEM,
@@ -193,7 +185,6 @@ static struct platform_device tmu3_device = {
193}; 185};
194 186
195static struct sh_timer_config tmu4_platform_data = { 187static struct sh_timer_config tmu4_platform_data = {
196 .name = "TMU4",
197 .channel_offset = 0x10, 188 .channel_offset = 0x10,
198 .timer_bit = 1, 189 .timer_bit = 1,
199 .clk = "peripheral_clk", 190 .clk = "peripheral_clk",
@@ -201,7 +192,6 @@ static struct sh_timer_config tmu4_platform_data = {
201 192
202static struct resource tmu4_resources[] = { 193static struct resource tmu4_resources[] = {
203 [0] = { 194 [0] = {
204 .name = "TMU4",
205 .start = 0xfe100014, 195 .start = 0xfe100014,
206 .end = 0xfe10001f, 196 .end = 0xfe10001f,
207 .flags = IORESOURCE_MEM, 197 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index a16eb3656f4b..fa43da0502bd 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -187,7 +187,6 @@ static struct platform_device scif3_device = {
187}; 187};
188 188
189static struct sh_timer_config tmu0_platform_data = { 189static struct sh_timer_config tmu0_platform_data = {
190 .name = "TMU0",
191 .channel_offset = 0x04, 190 .channel_offset = 0x04,
192 .timer_bit = 0, 191 .timer_bit = 0,
193 .clk = "peripheral_clk", 192 .clk = "peripheral_clk",
@@ -196,7 +195,6 @@ static struct sh_timer_config tmu0_platform_data = {
196 195
197static struct resource tmu0_resources[] = { 196static struct resource tmu0_resources[] = {
198 [0] = { 197 [0] = {
199 .name = "TMU0",
200 .start = 0xffd80008, 198 .start = 0xffd80008,
201 .end = 0xffd80013, 199 .end = 0xffd80013,
202 .flags = IORESOURCE_MEM, 200 .flags = IORESOURCE_MEM,
@@ -218,7 +216,6 @@ static struct platform_device tmu0_device = {
218}; 216};
219 217
220static struct sh_timer_config tmu1_platform_data = { 218static struct sh_timer_config tmu1_platform_data = {
221 .name = "TMU1",
222 .channel_offset = 0x10, 219 .channel_offset = 0x10,
223 .timer_bit = 1, 220 .timer_bit = 1,
224 .clk = "peripheral_clk", 221 .clk = "peripheral_clk",
@@ -227,7 +224,6 @@ static struct sh_timer_config tmu1_platform_data = {
227 224
228static struct resource tmu1_resources[] = { 225static struct resource tmu1_resources[] = {
229 [0] = { 226 [0] = {
230 .name = "TMU1",
231 .start = 0xffd80014, 227 .start = 0xffd80014,
232 .end = 0xffd8001f, 228 .end = 0xffd8001f,
233 .flags = IORESOURCE_MEM, 229 .flags = IORESOURCE_MEM,
@@ -249,7 +245,6 @@ static struct platform_device tmu1_device = {
249}; 245};
250 246
251static struct sh_timer_config tmu2_platform_data = { 247static struct sh_timer_config tmu2_platform_data = {
252 .name = "TMU2",
253 .channel_offset = 0x1c, 248 .channel_offset = 0x1c,
254 .timer_bit = 2, 249 .timer_bit = 2,
255 .clk = "peripheral_clk", 250 .clk = "peripheral_clk",
@@ -257,7 +252,6 @@ static struct sh_timer_config tmu2_platform_data = {
257 252
258static struct resource tmu2_resources[] = { 253static struct resource tmu2_resources[] = {
259 [0] = { 254 [0] = {
260 .name = "TMU2",
261 .start = 0xffd80020, 255 .start = 0xffd80020,
262 .end = 0xffd8002f, 256 .end = 0xffd8002f,
263 .flags = IORESOURCE_MEM, 257 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index 45eb1bfd42c9..fdbd7d07a69f 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
@@ -207,7 +207,6 @@ static struct platform_device jpu_device = {
207}; 207};
208 208
209static struct sh_timer_config cmt_platform_data = { 209static struct sh_timer_config cmt_platform_data = {
210 .name = "CMT",
211 .channel_offset = 0x60, 210 .channel_offset = 0x60,
212 .timer_bit = 5, 211 .timer_bit = 5,
213 .clk = "cmt0", 212 .clk = "cmt0",
@@ -217,7 +216,6 @@ static struct sh_timer_config cmt_platform_data = {
217 216
218static struct resource cmt_resources[] = { 217static struct resource cmt_resources[] = {
219 [0] = { 218 [0] = {
220 .name = "CMT",
221 .start = 0x044a0060, 219 .start = 0x044a0060,
222 .end = 0x044a006b, 220 .end = 0x044a006b,
223 .flags = IORESOURCE_MEM, 221 .flags = IORESOURCE_MEM,
@@ -239,7 +237,6 @@ static struct platform_device cmt_device = {
239}; 237};
240 238
241static struct sh_timer_config tmu0_platform_data = { 239static struct sh_timer_config tmu0_platform_data = {
242 .name = "TMU0",
243 .channel_offset = 0x04, 240 .channel_offset = 0x04,
244 .timer_bit = 0, 241 .timer_bit = 0,
245 .clk = "tmu0", 242 .clk = "tmu0",
@@ -248,7 +245,6 @@ static struct sh_timer_config tmu0_platform_data = {
248 245
249static struct resource tmu0_resources[] = { 246static struct resource tmu0_resources[] = {
250 [0] = { 247 [0] = {
251 .name = "TMU0",
252 .start = 0xffd80008, 248 .start = 0xffd80008,
253 .end = 0xffd80013, 249 .end = 0xffd80013,
254 .flags = IORESOURCE_MEM, 250 .flags = IORESOURCE_MEM,
@@ -270,7 +266,6 @@ static struct platform_device tmu0_device = {
270}; 266};
271 267
272static struct sh_timer_config tmu1_platform_data = { 268static struct sh_timer_config tmu1_platform_data = {
273 .name = "TMU1",
274 .channel_offset = 0x10, 269 .channel_offset = 0x10,
275 .timer_bit = 1, 270 .timer_bit = 1,
276 .clk = "tmu0", 271 .clk = "tmu0",
@@ -279,7 +274,6 @@ static struct sh_timer_config tmu1_platform_data = {
279 274
280static struct resource tmu1_resources[] = { 275static struct resource tmu1_resources[] = {
281 [0] = { 276 [0] = {
282 .name = "TMU1",
283 .start = 0xffd80014, 277 .start = 0xffd80014,
284 .end = 0xffd8001f, 278 .end = 0xffd8001f,
285 .flags = IORESOURCE_MEM, 279 .flags = IORESOURCE_MEM,
@@ -301,7 +295,6 @@ static struct platform_device tmu1_device = {
301}; 295};
302 296
303static struct sh_timer_config tmu2_platform_data = { 297static struct sh_timer_config tmu2_platform_data = {
304 .name = "TMU2",
305 .channel_offset = 0x1c, 298 .channel_offset = 0x1c,
306 .timer_bit = 2, 299 .timer_bit = 2,
307 .clk = "tmu0", 300 .clk = "tmu0",
@@ -309,7 +302,6 @@ static struct sh_timer_config tmu2_platform_data = {
309 302
310static struct resource tmu2_resources[] = { 303static struct resource tmu2_resources[] = {
311 [0] = { 304 [0] = {
312 .name = "TMU2",
313 .start = 0xffd80020, 305 .start = 0xffd80020,
314 .end = 0xffd8002b, 306 .end = 0xffd8002b,
315 .flags = IORESOURCE_MEM, 307 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
index c494c193e3b6..d90fe0a65c2a 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
@@ -169,7 +169,6 @@ static struct platform_device veu1_device = {
169}; 169};
170 170
171static struct sh_timer_config cmt_platform_data = { 171static struct sh_timer_config cmt_platform_data = {
172 .name = "CMT",
173 .channel_offset = 0x60, 172 .channel_offset = 0x60,
174 .timer_bit = 5, 173 .timer_bit = 5,
175 .clk = "cmt0", 174 .clk = "cmt0",
@@ -179,7 +178,6 @@ static struct sh_timer_config cmt_platform_data = {
179 178
180static struct resource cmt_resources[] = { 179static struct resource cmt_resources[] = {
181 [0] = { 180 [0] = {
182 .name = "CMT",
183 .start = 0x044a0060, 181 .start = 0x044a0060,
184 .end = 0x044a006b, 182 .end = 0x044a006b,
185 .flags = IORESOURCE_MEM, 183 .flags = IORESOURCE_MEM,
@@ -201,7 +199,6 @@ static struct platform_device cmt_device = {
201}; 199};
202 200
203static struct sh_timer_config tmu0_platform_data = { 201static struct sh_timer_config tmu0_platform_data = {
204 .name = "TMU0",
205 .channel_offset = 0x04, 202 .channel_offset = 0x04,
206 .timer_bit = 0, 203 .timer_bit = 0,
207 .clk = "tmu0", 204 .clk = "tmu0",
@@ -210,7 +207,6 @@ static struct sh_timer_config tmu0_platform_data = {
210 207
211static struct resource tmu0_resources[] = { 208static struct resource tmu0_resources[] = {
212 [0] = { 209 [0] = {
213 .name = "TMU0",
214 .start = 0xffd80008, 210 .start = 0xffd80008,
215 .end = 0xffd80013, 211 .end = 0xffd80013,
216 .flags = IORESOURCE_MEM, 212 .flags = IORESOURCE_MEM,
@@ -232,7 +228,6 @@ static struct platform_device tmu0_device = {
232}; 228};
233 229
234static struct sh_timer_config tmu1_platform_data = { 230static struct sh_timer_config tmu1_platform_data = {
235 .name = "TMU1",
236 .channel_offset = 0x10, 231 .channel_offset = 0x10,
237 .timer_bit = 1, 232 .timer_bit = 1,
238 .clk = "tmu0", 233 .clk = "tmu0",
@@ -241,7 +236,6 @@ static struct sh_timer_config tmu1_platform_data = {
241 236
242static struct resource tmu1_resources[] = { 237static struct resource tmu1_resources[] = {
243 [0] = { 238 [0] = {
244 .name = "TMU1",
245 .start = 0xffd80014, 239 .start = 0xffd80014,
246 .end = 0xffd8001f, 240 .end = 0xffd8001f,
247 .flags = IORESOURCE_MEM, 241 .flags = IORESOURCE_MEM,
@@ -263,7 +257,6 @@ static struct platform_device tmu1_device = {
263}; 257};
264 258
265static struct sh_timer_config tmu2_platform_data = { 259static struct sh_timer_config tmu2_platform_data = {
266 .name = "TMU2",
267 .channel_offset = 0x1c, 260 .channel_offset = 0x1c,
268 .timer_bit = 2, 261 .timer_bit = 2,
269 .clk = "tmu0", 262 .clk = "tmu0",
@@ -271,7 +264,6 @@ static struct sh_timer_config tmu2_platform_data = {
271 264
272static struct resource tmu2_resources[] = { 265static struct resource tmu2_resources[] = {
273 [0] = { 266 [0] = {
274 .name = "TMU2",
275 .start = 0xffd80020, 267 .start = 0xffd80020,
276 .end = 0xffd8002b, 268 .end = 0xffd8002b,
277 .flags = IORESOURCE_MEM, 269 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index fd7e3639e845..83ae9ad19874 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -401,7 +401,6 @@ static struct platform_device jpu_device = {
401}; 401};
402 402
403static struct sh_timer_config cmt_platform_data = { 403static struct sh_timer_config cmt_platform_data = {
404 .name = "CMT",
405 .channel_offset = 0x60, 404 .channel_offset = 0x60,
406 .timer_bit = 5, 405 .timer_bit = 5,
407 .clk = "cmt0", 406 .clk = "cmt0",
@@ -411,7 +410,6 @@ static struct sh_timer_config cmt_platform_data = {
411 410
412static struct resource cmt_resources[] = { 411static struct resource cmt_resources[] = {
413 [0] = { 412 [0] = {
414 .name = "CMT",
415 .start = 0x044a0060, 413 .start = 0x044a0060,
416 .end = 0x044a006b, 414 .end = 0x044a006b,
417 .flags = IORESOURCE_MEM, 415 .flags = IORESOURCE_MEM,
@@ -436,7 +434,6 @@ static struct platform_device cmt_device = {
436}; 434};
437 435
438static struct sh_timer_config tmu0_platform_data = { 436static struct sh_timer_config tmu0_platform_data = {
439 .name = "TMU0",
440 .channel_offset = 0x04, 437 .channel_offset = 0x04,
441 .timer_bit = 0, 438 .timer_bit = 0,
442 .clk = "tmu0", 439 .clk = "tmu0",
@@ -445,7 +442,6 @@ static struct sh_timer_config tmu0_platform_data = {
445 442
446static struct resource tmu0_resources[] = { 443static struct resource tmu0_resources[] = {
447 [0] = { 444 [0] = {
448 .name = "TMU0",
449 .start = 0xffd80008, 445 .start = 0xffd80008,
450 .end = 0xffd80013, 446 .end = 0xffd80013,
451 .flags = IORESOURCE_MEM, 447 .flags = IORESOURCE_MEM,
@@ -470,7 +466,6 @@ static struct platform_device tmu0_device = {
470}; 466};
471 467
472static struct sh_timer_config tmu1_platform_data = { 468static struct sh_timer_config tmu1_platform_data = {
473 .name = "TMU1",
474 .channel_offset = 0x10, 469 .channel_offset = 0x10,
475 .timer_bit = 1, 470 .timer_bit = 1,
476 .clk = "tmu0", 471 .clk = "tmu0",
@@ -479,7 +474,6 @@ static struct sh_timer_config tmu1_platform_data = {
479 474
480static struct resource tmu1_resources[] = { 475static struct resource tmu1_resources[] = {
481 [0] = { 476 [0] = {
482 .name = "TMU1",
483 .start = 0xffd80014, 477 .start = 0xffd80014,
484 .end = 0xffd8001f, 478 .end = 0xffd8001f,
485 .flags = IORESOURCE_MEM, 479 .flags = IORESOURCE_MEM,
@@ -504,7 +498,6 @@ static struct platform_device tmu1_device = {
504}; 498};
505 499
506static struct sh_timer_config tmu2_platform_data = { 500static struct sh_timer_config tmu2_platform_data = {
507 .name = "TMU2",
508 .channel_offset = 0x1c, 501 .channel_offset = 0x1c,
509 .timer_bit = 2, 502 .timer_bit = 2,
510 .clk = "tmu0", 503 .clk = "tmu0",
@@ -512,7 +505,6 @@ static struct sh_timer_config tmu2_platform_data = {
512 505
513static struct resource tmu2_resources[] = { 506static struct resource tmu2_resources[] = {
514 [0] = { 507 [0] = {
515 .name = "TMU2",
516 .start = 0xffd80020, 508 .start = 0xffd80020,
517 .end = 0xffd8002b, 509 .end = 0xffd8002b,
518 .flags = IORESOURCE_MEM, 510 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index 85c61f624702..68446b3f06af 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -211,7 +211,6 @@ static struct platform_device veu1_device = {
211}; 211};
212 212
213static struct sh_timer_config cmt_platform_data = { 213static struct sh_timer_config cmt_platform_data = {
214 .name = "CMT",
215 .channel_offset = 0x60, 214 .channel_offset = 0x60,
216 .timer_bit = 5, 215 .timer_bit = 5,
217 .clk = "cmt0", 216 .clk = "cmt0",
@@ -221,7 +220,6 @@ static struct sh_timer_config cmt_platform_data = {
221 220
222static struct resource cmt_resources[] = { 221static struct resource cmt_resources[] = {
223 [0] = { 222 [0] = {
224 .name = "CMT",
225 .start = 0x044a0060, 223 .start = 0x044a0060,
226 .end = 0x044a006b, 224 .end = 0x044a006b,
227 .flags = IORESOURCE_MEM, 225 .flags = IORESOURCE_MEM,
@@ -246,7 +244,6 @@ static struct platform_device cmt_device = {
246}; 244};
247 245
248static struct sh_timer_config tmu0_platform_data = { 246static struct sh_timer_config tmu0_platform_data = {
249 .name = "TMU0",
250 .channel_offset = 0x04, 247 .channel_offset = 0x04,
251 .timer_bit = 0, 248 .timer_bit = 0,
252 .clk = "tmu0", 249 .clk = "tmu0",
@@ -255,7 +252,6 @@ static struct sh_timer_config tmu0_platform_data = {
255 252
256static struct resource tmu0_resources[] = { 253static struct resource tmu0_resources[] = {
257 [0] = { 254 [0] = {
258 .name = "TMU0",
259 .start = 0xffd80008, 255 .start = 0xffd80008,
260 .end = 0xffd80013, 256 .end = 0xffd80013,
261 .flags = IORESOURCE_MEM, 257 .flags = IORESOURCE_MEM,
@@ -280,7 +276,6 @@ static struct platform_device tmu0_device = {
280}; 276};
281 277
282static struct sh_timer_config tmu1_platform_data = { 278static struct sh_timer_config tmu1_platform_data = {
283 .name = "TMU1",
284 .channel_offset = 0x10, 279 .channel_offset = 0x10,
285 .timer_bit = 1, 280 .timer_bit = 1,
286 .clk = "tmu0", 281 .clk = "tmu0",
@@ -289,7 +284,6 @@ static struct sh_timer_config tmu1_platform_data = {
289 284
290static struct resource tmu1_resources[] = { 285static struct resource tmu1_resources[] = {
291 [0] = { 286 [0] = {
292 .name = "TMU1",
293 .start = 0xffd80014, 287 .start = 0xffd80014,
294 .end = 0xffd8001f, 288 .end = 0xffd8001f,
295 .flags = IORESOURCE_MEM, 289 .flags = IORESOURCE_MEM,
@@ -314,7 +308,6 @@ static struct platform_device tmu1_device = {
314}; 308};
315 309
316static struct sh_timer_config tmu2_platform_data = { 310static struct sh_timer_config tmu2_platform_data = {
317 .name = "TMU2",
318 .channel_offset = 0x1c, 311 .channel_offset = 0x1c,
319 .timer_bit = 2, 312 .timer_bit = 2,
320 .clk = "tmu0", 313 .clk = "tmu0",
@@ -322,7 +315,6 @@ static struct sh_timer_config tmu2_platform_data = {
322 315
323static struct resource tmu2_resources[] = { 316static struct resource tmu2_resources[] = {
324 [0] = { 317 [0] = {
325 .name = "TMU2",
326 .start = 0xffd80020, 318 .start = 0xffd80020,
327 .end = 0xffd8002b, 319 .end = 0xffd8002b,
328 .flags = IORESOURCE_MEM, 320 .flags = IORESOURCE_MEM,
@@ -347,7 +339,6 @@ static struct platform_device tmu2_device = {
347}; 339};
348 340
349static struct sh_timer_config tmu3_platform_data = { 341static struct sh_timer_config tmu3_platform_data = {
350 .name = "TMU3",
351 .channel_offset = 0x04, 342 .channel_offset = 0x04,
352 .timer_bit = 0, 343 .timer_bit = 0,
353 .clk = "tmu1", 344 .clk = "tmu1",
@@ -355,7 +346,6 @@ static struct sh_timer_config tmu3_platform_data = {
355 346
356static struct resource tmu3_resources[] = { 347static struct resource tmu3_resources[] = {
357 [0] = { 348 [0] = {
358 .name = "TMU3",
359 .start = 0xffd90008, 349 .start = 0xffd90008,
360 .end = 0xffd90013, 350 .end = 0xffd90013,
361 .flags = IORESOURCE_MEM, 351 .flags = IORESOURCE_MEM,
@@ -380,7 +370,6 @@ static struct platform_device tmu3_device = {
380}; 370};
381 371
382static struct sh_timer_config tmu4_platform_data = { 372static struct sh_timer_config tmu4_platform_data = {
383 .name = "TMU4",
384 .channel_offset = 0x10, 373 .channel_offset = 0x10,
385 .timer_bit = 1, 374 .timer_bit = 1,
386 .clk = "tmu1", 375 .clk = "tmu1",
@@ -388,7 +377,6 @@ static struct sh_timer_config tmu4_platform_data = {
388 377
389static struct resource tmu4_resources[] = { 378static struct resource tmu4_resources[] = {
390 [0] = { 379 [0] = {
391 .name = "TMU4",
392 .start = 0xffd90014, 380 .start = 0xffd90014,
393 .end = 0xffd9001f, 381 .end = 0xffd9001f,
394 .flags = IORESOURCE_MEM, 382 .flags = IORESOURCE_MEM,
@@ -413,7 +401,6 @@ static struct platform_device tmu4_device = {
413}; 401};
414 402
415static struct sh_timer_config tmu5_platform_data = { 403static struct sh_timer_config tmu5_platform_data = {
416 .name = "TMU5",
417 .channel_offset = 0x1c, 404 .channel_offset = 0x1c,
418 .timer_bit = 2, 405 .timer_bit = 2,
419 .clk = "tmu1", 406 .clk = "tmu1",
@@ -421,7 +408,6 @@ static struct sh_timer_config tmu5_platform_data = {
421 408
422static struct resource tmu5_resources[] = { 409static struct resource tmu5_resources[] = {
423 [0] = { 410 [0] = {
424 .name = "TMU5",
425 .start = 0xffd90020, 411 .start = 0xffd90020,
426 .end = 0xffd9002b, 412 .end = 0xffd9002b,
427 .flags = IORESOURCE_MEM, 413 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index e7fa2a92fc1f..abc98b0fef91 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -485,7 +485,6 @@ static struct platform_device veu1_device = {
485}; 485};
486 486
487static struct sh_timer_config cmt_platform_data = { 487static struct sh_timer_config cmt_platform_data = {
488 .name = "CMT",
489 .channel_offset = 0x60, 488 .channel_offset = 0x60,
490 .timer_bit = 5, 489 .timer_bit = 5,
491 .clk = "cmt0", 490 .clk = "cmt0",
@@ -495,7 +494,6 @@ static struct sh_timer_config cmt_platform_data = {
495 494
496static struct resource cmt_resources[] = { 495static struct resource cmt_resources[] = {
497 [0] = { 496 [0] = {
498 .name = "CMT",
499 .start = 0x044a0060, 497 .start = 0x044a0060,
500 .end = 0x044a006b, 498 .end = 0x044a006b,
501 .flags = IORESOURCE_MEM, 499 .flags = IORESOURCE_MEM,
@@ -520,7 +518,6 @@ static struct platform_device cmt_device = {
520}; 518};
521 519
522static struct sh_timer_config tmu0_platform_data = { 520static struct sh_timer_config tmu0_platform_data = {
523 .name = "TMU0",
524 .channel_offset = 0x04, 521 .channel_offset = 0x04,
525 .timer_bit = 0, 522 .timer_bit = 0,
526 .clk = "tmu0", 523 .clk = "tmu0",
@@ -529,7 +526,6 @@ static struct sh_timer_config tmu0_platform_data = {
529 526
530static struct resource tmu0_resources[] = { 527static struct resource tmu0_resources[] = {
531 [0] = { 528 [0] = {
532 .name = "TMU0",
533 .start = 0xffd80008, 529 .start = 0xffd80008,
534 .end = 0xffd80013, 530 .end = 0xffd80013,
535 .flags = IORESOURCE_MEM, 531 .flags = IORESOURCE_MEM,
@@ -554,7 +550,6 @@ static struct platform_device tmu0_device = {
554}; 550};
555 551
556static struct sh_timer_config tmu1_platform_data = { 552static struct sh_timer_config tmu1_platform_data = {
557 .name = "TMU1",
558 .channel_offset = 0x10, 553 .channel_offset = 0x10,
559 .timer_bit = 1, 554 .timer_bit = 1,
560 .clk = "tmu0", 555 .clk = "tmu0",
@@ -563,7 +558,6 @@ static struct sh_timer_config tmu1_platform_data = {
563 558
564static struct resource tmu1_resources[] = { 559static struct resource tmu1_resources[] = {
565 [0] = { 560 [0] = {
566 .name = "TMU1",
567 .start = 0xffd80014, 561 .start = 0xffd80014,
568 .end = 0xffd8001f, 562 .end = 0xffd8001f,
569 .flags = IORESOURCE_MEM, 563 .flags = IORESOURCE_MEM,
@@ -588,7 +582,6 @@ static struct platform_device tmu1_device = {
588}; 582};
589 583
590static struct sh_timer_config tmu2_platform_data = { 584static struct sh_timer_config tmu2_platform_data = {
591 .name = "TMU2",
592 .channel_offset = 0x1c, 585 .channel_offset = 0x1c,
593 .timer_bit = 2, 586 .timer_bit = 2,
594 .clk = "tmu0", 587 .clk = "tmu0",
@@ -596,7 +589,6 @@ static struct sh_timer_config tmu2_platform_data = {
596 589
597static struct resource tmu2_resources[] = { 590static struct resource tmu2_resources[] = {
598 [0] = { 591 [0] = {
599 .name = "TMU2",
600 .start = 0xffd80020, 592 .start = 0xffd80020,
601 .end = 0xffd8002b, 593 .end = 0xffd8002b,
602 .flags = IORESOURCE_MEM, 594 .flags = IORESOURCE_MEM,
@@ -622,7 +614,6 @@ static struct platform_device tmu2_device = {
622 614
623 615
624static struct sh_timer_config tmu3_platform_data = { 616static struct sh_timer_config tmu3_platform_data = {
625 .name = "TMU3",
626 .channel_offset = 0x04, 617 .channel_offset = 0x04,
627 .timer_bit = 0, 618 .timer_bit = 0,
628 .clk = "tmu1", 619 .clk = "tmu1",
@@ -630,7 +621,6 @@ static struct sh_timer_config tmu3_platform_data = {
630 621
631static struct resource tmu3_resources[] = { 622static struct resource tmu3_resources[] = {
632 [0] = { 623 [0] = {
633 .name = "TMU3",
634 .start = 0xffd90008, 624 .start = 0xffd90008,
635 .end = 0xffd90013, 625 .end = 0xffd90013,
636 .flags = IORESOURCE_MEM, 626 .flags = IORESOURCE_MEM,
@@ -655,7 +645,6 @@ static struct platform_device tmu3_device = {
655}; 645};
656 646
657static struct sh_timer_config tmu4_platform_data = { 647static struct sh_timer_config tmu4_platform_data = {
658 .name = "TMU4",
659 .channel_offset = 0x10, 648 .channel_offset = 0x10,
660 .timer_bit = 1, 649 .timer_bit = 1,
661 .clk = "tmu1", 650 .clk = "tmu1",
@@ -663,7 +652,6 @@ static struct sh_timer_config tmu4_platform_data = {
663 652
664static struct resource tmu4_resources[] = { 653static struct resource tmu4_resources[] = {
665 [0] = { 654 [0] = {
666 .name = "TMU4",
667 .start = 0xffd90014, 655 .start = 0xffd90014,
668 .end = 0xffd9001f, 656 .end = 0xffd9001f,
669 .flags = IORESOURCE_MEM, 657 .flags = IORESOURCE_MEM,
@@ -688,7 +676,6 @@ static struct platform_device tmu4_device = {
688}; 676};
689 677
690static struct sh_timer_config tmu5_platform_data = { 678static struct sh_timer_config tmu5_platform_data = {
691 .name = "TMU5",
692 .channel_offset = 0x1c, 679 .channel_offset = 0x1c,
693 .timer_bit = 2, 680 .timer_bit = 2,
694 .clk = "tmu1", 681 .clk = "tmu1",
@@ -696,7 +683,6 @@ static struct sh_timer_config tmu5_platform_data = {
696 683
697static struct resource tmu5_resources[] = { 684static struct resource tmu5_resources[] = {
698 [0] = { 685 [0] = {
699 .name = "TMU5",
700 .start = 0xffd90020, 686 .start = 0xffd90020,
701 .end = 0xffd9002b, 687 .end = 0xffd9002b,
702 .flags = IORESOURCE_MEM, 688 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index e75edf58796a..25eddf24f634 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -63,7 +63,6 @@ static struct platform_device scif4_device = {
63}; 63};
64 64
65static struct sh_timer_config tmu0_platform_data = { 65static struct sh_timer_config tmu0_platform_data = {
66 .name = "TMU0",
67 .channel_offset = 0x04, 66 .channel_offset = 0x04,
68 .timer_bit = 0, 67 .timer_bit = 0,
69 .clk = "peripheral_clk", 68 .clk = "peripheral_clk",
@@ -72,7 +71,6 @@ static struct sh_timer_config tmu0_platform_data = {
72 71
73static struct resource tmu0_resources[] = { 72static struct resource tmu0_resources[] = {
74 [0] = { 73 [0] = {
75 .name = "TMU0",
76 .start = 0xfe430008, 74 .start = 0xfe430008,
77 .end = 0xfe430013, 75 .end = 0xfe430013,
78 .flags = IORESOURCE_MEM, 76 .flags = IORESOURCE_MEM,
@@ -94,7 +92,6 @@ static struct platform_device tmu0_device = {
94}; 92};
95 93
96static struct sh_timer_config tmu1_platform_data = { 94static struct sh_timer_config tmu1_platform_data = {
97 .name = "TMU1",
98 .channel_offset = 0x10, 95 .channel_offset = 0x10,
99 .timer_bit = 1, 96 .timer_bit = 1,
100 .clk = "peripheral_clk", 97 .clk = "peripheral_clk",
@@ -103,7 +100,6 @@ static struct sh_timer_config tmu1_platform_data = {
103 100
104static struct resource tmu1_resources[] = { 101static struct resource tmu1_resources[] = {
105 [0] = { 102 [0] = {
106 .name = "TMU1",
107 .start = 0xfe430014, 103 .start = 0xfe430014,
108 .end = 0xfe43001f, 104 .end = 0xfe43001f,
109 .flags = IORESOURCE_MEM, 105 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index 7f6b0a5f7f82..a91263e0358b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -131,7 +131,6 @@ static struct platform_device usbf_device = {
131}; 131};
132 132
133static struct sh_timer_config tmu0_platform_data = { 133static struct sh_timer_config tmu0_platform_data = {
134 .name = "TMU0",
135 .channel_offset = 0x04, 134 .channel_offset = 0x04,
136 .timer_bit = 0, 135 .timer_bit = 0,
137 .clk = "peripheral_clk", 136 .clk = "peripheral_clk",
@@ -140,7 +139,6 @@ static struct sh_timer_config tmu0_platform_data = {
140 139
141static struct resource tmu0_resources[] = { 140static struct resource tmu0_resources[] = {
142 [0] = { 141 [0] = {
143 .name = "TMU0",
144 .start = 0xffd80008, 142 .start = 0xffd80008,
145 .end = 0xffd80013, 143 .end = 0xffd80013,
146 .flags = IORESOURCE_MEM, 144 .flags = IORESOURCE_MEM,
@@ -162,7 +160,6 @@ static struct platform_device tmu0_device = {
162}; 160};
163 161
164static struct sh_timer_config tmu1_platform_data = { 162static struct sh_timer_config tmu1_platform_data = {
165 .name = "TMU1",
166 .channel_offset = 0x10, 163 .channel_offset = 0x10,
167 .timer_bit = 1, 164 .timer_bit = 1,
168 .clk = "peripheral_clk", 165 .clk = "peripheral_clk",
@@ -171,7 +168,6 @@ static struct sh_timer_config tmu1_platform_data = {
171 168
172static struct resource tmu1_resources[] = { 169static struct resource tmu1_resources[] = {
173 [0] = { 170 [0] = {
174 .name = "TMU1",
175 .start = 0xffd80014, 171 .start = 0xffd80014,
176 .end = 0xffd8001f, 172 .end = 0xffd8001f,
177 .flags = IORESOURCE_MEM, 173 .flags = IORESOURCE_MEM,
@@ -193,7 +189,6 @@ static struct platform_device tmu1_device = {
193}; 189};
194 190
195static struct sh_timer_config tmu2_platform_data = { 191static struct sh_timer_config tmu2_platform_data = {
196 .name = "TMU2",
197 .channel_offset = 0x1c, 192 .channel_offset = 0x1c,
198 .timer_bit = 2, 193 .timer_bit = 2,
199 .clk = "peripheral_clk", 194 .clk = "peripheral_clk",
@@ -201,7 +196,6 @@ static struct sh_timer_config tmu2_platform_data = {
201 196
202static struct resource tmu2_resources[] = { 197static struct resource tmu2_resources[] = {
203 [0] = { 198 [0] = {
204 .name = "TMU2",
205 .start = 0xffd80020, 199 .start = 0xffd80020,
206 .end = 0xffd8002f, 200 .end = 0xffd8002f,
207 .flags = IORESOURCE_MEM, 201 .flags = IORESOURCE_MEM,
@@ -223,7 +217,6 @@ static struct platform_device tmu2_device = {
223}; 217};
224 218
225static struct sh_timer_config tmu3_platform_data = { 219static struct sh_timer_config tmu3_platform_data = {
226 .name = "TMU3",
227 .channel_offset = 0x04, 220 .channel_offset = 0x04,
228 .timer_bit = 0, 221 .timer_bit = 0,
229 .clk = "peripheral_clk", 222 .clk = "peripheral_clk",
@@ -231,7 +224,6 @@ static struct sh_timer_config tmu3_platform_data = {
231 224
232static struct resource tmu3_resources[] = { 225static struct resource tmu3_resources[] = {
233 [0] = { 226 [0] = {
234 .name = "TMU3",
235 .start = 0xffd88008, 227 .start = 0xffd88008,
236 .end = 0xffd88013, 228 .end = 0xffd88013,
237 .flags = IORESOURCE_MEM, 229 .flags = IORESOURCE_MEM,
@@ -253,7 +245,6 @@ static struct platform_device tmu3_device = {
253}; 245};
254 246
255static struct sh_timer_config tmu4_platform_data = { 247static struct sh_timer_config tmu4_platform_data = {
256 .name = "TMU4",
257 .channel_offset = 0x10, 248 .channel_offset = 0x10,
258 .timer_bit = 1, 249 .timer_bit = 1,
259 .clk = "peripheral_clk", 250 .clk = "peripheral_clk",
@@ -261,7 +252,6 @@ static struct sh_timer_config tmu4_platform_data = {
261 252
262static struct resource tmu4_resources[] = { 253static struct resource tmu4_resources[] = {
263 [0] = { 254 [0] = {
264 .name = "TMU4",
265 .start = 0xffd88014, 255 .start = 0xffd88014,
266 .end = 0xffd8801f, 256 .end = 0xffd8801f,
267 .flags = IORESOURCE_MEM, 257 .flags = IORESOURCE_MEM,
@@ -283,7 +273,6 @@ static struct platform_device tmu4_device = {
283}; 273};
284 274
285static struct sh_timer_config tmu5_platform_data = { 275static struct sh_timer_config tmu5_platform_data = {
286 .name = "TMU5",
287 .channel_offset = 0x1c, 276 .channel_offset = 0x1c,
288 .timer_bit = 2, 277 .timer_bit = 2,
289 .clk = "peripheral_clk", 278 .clk = "peripheral_clk",
@@ -291,7 +280,6 @@ static struct sh_timer_config tmu5_platform_data = {
291 280
292static struct resource tmu5_resources[] = { 281static struct resource tmu5_resources[] = {
293 [0] = { 282 [0] = {
294 .name = "TMU5",
295 .start = 0xffd88020, 283 .start = 0xffd88020,
296 .end = 0xffd8802b, 284 .end = 0xffd8802b,
297 .flags = IORESOURCE_MEM, 285 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
index 86d681ecf90e..83a27b0e4ed2 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
@@ -165,7 +165,6 @@ static struct platform_device scif9_device = {
165}; 165};
166 166
167static struct sh_timer_config tmu0_platform_data = { 167static struct sh_timer_config tmu0_platform_data = {
168 .name = "TMU0",
169 .channel_offset = 0x04, 168 .channel_offset = 0x04,
170 .timer_bit = 0, 169 .timer_bit = 0,
171 .clk = "peripheral_clk", 170 .clk = "peripheral_clk",
@@ -174,7 +173,6 @@ static struct sh_timer_config tmu0_platform_data = {
174 173
175static struct resource tmu0_resources[] = { 174static struct resource tmu0_resources[] = {
176 [0] = { 175 [0] = {
177 .name = "TMU0",
178 .start = 0xffd80008, 176 .start = 0xffd80008,
179 .end = 0xffd80013, 177 .end = 0xffd80013,
180 .flags = IORESOURCE_MEM, 178 .flags = IORESOURCE_MEM,
@@ -196,7 +194,6 @@ static struct platform_device tmu0_device = {
196}; 194};
197 195
198static struct sh_timer_config tmu1_platform_data = { 196static struct sh_timer_config tmu1_platform_data = {
199 .name = "TMU1",
200 .channel_offset = 0x10, 197 .channel_offset = 0x10,
201 .timer_bit = 1, 198 .timer_bit = 1,
202 .clk = "peripheral_clk", 199 .clk = "peripheral_clk",
@@ -205,7 +202,6 @@ static struct sh_timer_config tmu1_platform_data = {
205 202
206static struct resource tmu1_resources[] = { 203static struct resource tmu1_resources[] = {
207 [0] = { 204 [0] = {
208 .name = "TMU1",
209 .start = 0xffd80014, 205 .start = 0xffd80014,
210 .end = 0xffd8001f, 206 .end = 0xffd8001f,
211 .flags = IORESOURCE_MEM, 207 .flags = IORESOURCE_MEM,
@@ -227,7 +223,6 @@ static struct platform_device tmu1_device = {
227}; 223};
228 224
229static struct sh_timer_config tmu2_platform_data = { 225static struct sh_timer_config tmu2_platform_data = {
230 .name = "TMU2",
231 .channel_offset = 0x1c, 226 .channel_offset = 0x1c,
232 .timer_bit = 2, 227 .timer_bit = 2,
233 .clk = "peripheral_clk", 228 .clk = "peripheral_clk",
@@ -235,7 +230,6 @@ static struct sh_timer_config tmu2_platform_data = {
235 230
236static struct resource tmu2_resources[] = { 231static struct resource tmu2_resources[] = {
237 [0] = { 232 [0] = {
238 .name = "TMU2",
239 .start = 0xffd80020, 233 .start = 0xffd80020,
240 .end = 0xffd8002f, 234 .end = 0xffd8002f,
241 .flags = IORESOURCE_MEM, 235 .flags = IORESOURCE_MEM,
@@ -257,7 +251,6 @@ static struct platform_device tmu2_device = {
257}; 251};
258 252
259static struct sh_timer_config tmu3_platform_data = { 253static struct sh_timer_config tmu3_platform_data = {
260 .name = "TMU3",
261 .channel_offset = 0x04, 254 .channel_offset = 0x04,
262 .timer_bit = 0, 255 .timer_bit = 0,
263 .clk = "peripheral_clk", 256 .clk = "peripheral_clk",
@@ -265,7 +258,6 @@ static struct sh_timer_config tmu3_platform_data = {
265 258
266static struct resource tmu3_resources[] = { 259static struct resource tmu3_resources[] = {
267 [0] = { 260 [0] = {
268 .name = "TMU3",
269 .start = 0xffd81008, 261 .start = 0xffd81008,
270 .end = 0xffd81013, 262 .end = 0xffd81013,
271 .flags = IORESOURCE_MEM, 263 .flags = IORESOURCE_MEM,
@@ -287,7 +279,6 @@ static struct platform_device tmu3_device = {
287}; 279};
288 280
289static struct sh_timer_config tmu4_platform_data = { 281static struct sh_timer_config tmu4_platform_data = {
290 .name = "TMU4",
291 .channel_offset = 0x10, 282 .channel_offset = 0x10,
292 .timer_bit = 1, 283 .timer_bit = 1,
293 .clk = "peripheral_clk", 284 .clk = "peripheral_clk",
@@ -295,7 +286,6 @@ static struct sh_timer_config tmu4_platform_data = {
295 286
296static struct resource tmu4_resources[] = { 287static struct resource tmu4_resources[] = {
297 [0] = { 288 [0] = {
298 .name = "TMU4",
299 .start = 0xffd81014, 289 .start = 0xffd81014,
300 .end = 0xffd8101f, 290 .end = 0xffd8101f,
301 .flags = IORESOURCE_MEM, 291 .flags = IORESOURCE_MEM,
@@ -317,7 +307,6 @@ static struct platform_device tmu4_device = {
317}; 307};
318 308
319static struct sh_timer_config tmu5_platform_data = { 309static struct sh_timer_config tmu5_platform_data = {
320 .name = "TMU5",
321 .channel_offset = 0x1c, 310 .channel_offset = 0x1c,
322 .timer_bit = 2, 311 .timer_bit = 2,
323 .clk = "peripheral_clk", 312 .clk = "peripheral_clk",
@@ -325,7 +314,6 @@ static struct sh_timer_config tmu5_platform_data = {
325 314
326static struct resource tmu5_resources[] = { 315static struct resource tmu5_resources[] = {
327 [0] = { 316 [0] = {
328 .name = "TMU5",
329 .start = 0xffd81020, 317 .start = 0xffd81020,
330 .end = 0xffd8102f, 318 .end = 0xffd8102f,
331 .flags = IORESOURCE_MEM, 319 .flags = IORESOURCE_MEM,
@@ -347,7 +335,6 @@ static struct platform_device tmu5_device = {
347}; 335};
348 336
349static struct sh_timer_config tmu6_platform_data = { 337static struct sh_timer_config tmu6_platform_data = {
350 .name = "TMU6",
351 .channel_offset = 0x04, 338 .channel_offset = 0x04,
352 .timer_bit = 0, 339 .timer_bit = 0,
353 .clk = "peripheral_clk", 340 .clk = "peripheral_clk",
@@ -355,7 +342,6 @@ static struct sh_timer_config tmu6_platform_data = {
355 342
356static struct resource tmu6_resources[] = { 343static struct resource tmu6_resources[] = {
357 [0] = { 344 [0] = {
358 .name = "TMU6",
359 .start = 0xffd82008, 345 .start = 0xffd82008,
360 .end = 0xffd82013, 346 .end = 0xffd82013,
361 .flags = IORESOURCE_MEM, 347 .flags = IORESOURCE_MEM,
@@ -377,7 +363,6 @@ static struct platform_device tmu6_device = {
377}; 363};
378 364
379static struct sh_timer_config tmu7_platform_data = { 365static struct sh_timer_config tmu7_platform_data = {
380 .name = "TMU7",
381 .channel_offset = 0x10, 366 .channel_offset = 0x10,
382 .timer_bit = 1, 367 .timer_bit = 1,
383 .clk = "peripheral_clk", 368 .clk = "peripheral_clk",
@@ -385,7 +370,6 @@ static struct sh_timer_config tmu7_platform_data = {
385 370
386static struct resource tmu7_resources[] = { 371static struct resource tmu7_resources[] = {
387 [0] = { 372 [0] = {
388 .name = "TMU7",
389 .start = 0xffd82014, 373 .start = 0xffd82014,
390 .end = 0xffd8201f, 374 .end = 0xffd8201f,
391 .flags = IORESOURCE_MEM, 375 .flags = IORESOURCE_MEM,
@@ -407,7 +391,6 @@ static struct platform_device tmu7_device = {
407}; 391};
408 392
409static struct sh_timer_config tmu8_platform_data = { 393static struct sh_timer_config tmu8_platform_data = {
410 .name = "TMU8",
411 .channel_offset = 0x1c, 394 .channel_offset = 0x1c,
412 .timer_bit = 2, 395 .timer_bit = 2,
413 .clk = "peripheral_clk", 396 .clk = "peripheral_clk",
@@ -415,7 +398,6 @@ static struct sh_timer_config tmu8_platform_data = {
415 398
416static struct resource tmu8_resources[] = { 399static struct resource tmu8_resources[] = {
417 [0] = { 400 [0] = {
418 .name = "TMU8",
419 .start = 0xffd82020, 401 .start = 0xffd82020,
420 .end = 0xffd8202b, 402 .end = 0xffd8202b,
421 .flags = IORESOURCE_MEM, 403 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 02e792c90de6..f7c48e92b95b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -49,7 +49,6 @@ static struct platform_device scif1_device = {
49}; 49};
50 50
51static struct sh_timer_config tmu0_platform_data = { 51static struct sh_timer_config tmu0_platform_data = {
52 .name = "TMU0",
53 .channel_offset = 0x04, 52 .channel_offset = 0x04,
54 .timer_bit = 0, 53 .timer_bit = 0,
55 .clk = "peripheral_clk", 54 .clk = "peripheral_clk",
@@ -58,7 +57,6 @@ static struct sh_timer_config tmu0_platform_data = {
58 57
59static struct resource tmu0_resources[] = { 58static struct resource tmu0_resources[] = {
60 [0] = { 59 [0] = {
61 .name = "TMU0",
62 .start = 0xffd80008, 60 .start = 0xffd80008,
63 .end = 0xffd80013, 61 .end = 0xffd80013,
64 .flags = IORESOURCE_MEM, 62 .flags = IORESOURCE_MEM,
@@ -80,7 +78,6 @@ static struct platform_device tmu0_device = {
80}; 78};
81 79
82static struct sh_timer_config tmu1_platform_data = { 80static struct sh_timer_config tmu1_platform_data = {
83 .name = "TMU1",
84 .channel_offset = 0x10, 81 .channel_offset = 0x10,
85 .timer_bit = 1, 82 .timer_bit = 1,
86 .clk = "peripheral_clk", 83 .clk = "peripheral_clk",
@@ -89,7 +86,6 @@ static struct sh_timer_config tmu1_platform_data = {
89 86
90static struct resource tmu1_resources[] = { 87static struct resource tmu1_resources[] = {
91 [0] = { 88 [0] = {
92 .name = "TMU1",
93 .start = 0xffd80014, 89 .start = 0xffd80014,
94 .end = 0xffd8001f, 90 .end = 0xffd8001f,
95 .flags = IORESOURCE_MEM, 91 .flags = IORESOURCE_MEM,
@@ -111,7 +107,6 @@ static struct platform_device tmu1_device = {
111}; 107};
112 108
113static struct sh_timer_config tmu2_platform_data = { 109static struct sh_timer_config tmu2_platform_data = {
114 .name = "TMU2",
115 .channel_offset = 0x1c, 110 .channel_offset = 0x1c,
116 .timer_bit = 2, 111 .timer_bit = 2,
117 .clk = "peripheral_clk", 112 .clk = "peripheral_clk",
@@ -119,7 +114,6 @@ static struct sh_timer_config tmu2_platform_data = {
119 114
120static struct resource tmu2_resources[] = { 115static struct resource tmu2_resources[] = {
121 [0] = { 116 [0] = {
122 .name = "TMU2",
123 .start = 0xffd80020, 117 .start = 0xffd80020,
124 .end = 0xffd8002f, 118 .end = 0xffd8002f,
125 .flags = IORESOURCE_MEM, 119 .flags = IORESOURCE_MEM,
@@ -141,7 +135,6 @@ static struct platform_device tmu2_device = {
141}; 135};
142 136
143static struct sh_timer_config tmu3_platform_data = { 137static struct sh_timer_config tmu3_platform_data = {
144 .name = "TMU3",
145 .channel_offset = 0x04, 138 .channel_offset = 0x04,
146 .timer_bit = 0, 139 .timer_bit = 0,
147 .clk = "peripheral_clk", 140 .clk = "peripheral_clk",
@@ -149,7 +142,6 @@ static struct sh_timer_config tmu3_platform_data = {
149 142
150static struct resource tmu3_resources[] = { 143static struct resource tmu3_resources[] = {
151 [0] = { 144 [0] = {
152 .name = "TMU3",
153 .start = 0xffdc0008, 145 .start = 0xffdc0008,
154 .end = 0xffdc0013, 146 .end = 0xffdc0013,
155 .flags = IORESOURCE_MEM, 147 .flags = IORESOURCE_MEM,
@@ -171,7 +163,6 @@ static struct platform_device tmu3_device = {
171}; 163};
172 164
173static struct sh_timer_config tmu4_platform_data = { 165static struct sh_timer_config tmu4_platform_data = {
174 .name = "TMU4",
175 .channel_offset = 0x10, 166 .channel_offset = 0x10,
176 .timer_bit = 1, 167 .timer_bit = 1,
177 .clk = "peripheral_clk", 168 .clk = "peripheral_clk",
@@ -179,7 +170,6 @@ static struct sh_timer_config tmu4_platform_data = {
179 170
180static struct resource tmu4_resources[] = { 171static struct resource tmu4_resources[] = {
181 [0] = { 172 [0] = {
182 .name = "TMU4",
183 .start = 0xffdc0014, 173 .start = 0xffdc0014,
184 .end = 0xffdc001f, 174 .end = 0xffdc001f,
185 .flags = IORESOURCE_MEM, 175 .flags = IORESOURCE_MEM,
@@ -201,7 +191,6 @@ static struct platform_device tmu4_device = {
201}; 191};
202 192
203static struct sh_timer_config tmu5_platform_data = { 193static struct sh_timer_config tmu5_platform_data = {
204 .name = "TMU5",
205 .channel_offset = 0x1c, 194 .channel_offset = 0x1c,
206 .timer_bit = 2, 195 .timer_bit = 2,
207 .clk = "peripheral_clk", 196 .clk = "peripheral_clk",
@@ -209,7 +198,6 @@ static struct sh_timer_config tmu5_platform_data = {
209 198
210static struct resource tmu5_resources[] = { 199static struct resource tmu5_resources[] = {
211 [0] = { 200 [0] = {
212 .name = "TMU5",
213 .start = 0xffdc0020, 201 .start = 0xffdc0020,
214 .end = 0xffdc002b, 202 .end = 0xffdc002b,
215 .flags = IORESOURCE_MEM, 203 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 1fcd88b1671e..05e9308505cf 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -117,7 +117,6 @@ static struct platform_device scif5_device = {
117}; 117};
118 118
119static struct sh_timer_config tmu0_platform_data = { 119static struct sh_timer_config tmu0_platform_data = {
120 .name = "TMU0",
121 .channel_offset = 0x04, 120 .channel_offset = 0x04,
122 .timer_bit = 0, 121 .timer_bit = 0,
123 .clk = "tmu012_fck", 122 .clk = "tmu012_fck",
@@ -126,7 +125,6 @@ static struct sh_timer_config tmu0_platform_data = {
126 125
127static struct resource tmu0_resources[] = { 126static struct resource tmu0_resources[] = {
128 [0] = { 127 [0] = {
129 .name = "TMU0",
130 .start = 0xffd80008, 128 .start = 0xffd80008,
131 .end = 0xffd80013, 129 .end = 0xffd80013,
132 .flags = IORESOURCE_MEM, 130 .flags = IORESOURCE_MEM,
@@ -148,7 +146,6 @@ static struct platform_device tmu0_device = {
148}; 146};
149 147
150static struct sh_timer_config tmu1_platform_data = { 148static struct sh_timer_config tmu1_platform_data = {
151 .name = "TMU1",
152 .channel_offset = 0x10, 149 .channel_offset = 0x10,
153 .timer_bit = 1, 150 .timer_bit = 1,
154 .clk = "tmu012_fck", 151 .clk = "tmu012_fck",
@@ -157,7 +154,6 @@ static struct sh_timer_config tmu1_platform_data = {
157 154
158static struct resource tmu1_resources[] = { 155static struct resource tmu1_resources[] = {
159 [0] = { 156 [0] = {
160 .name = "TMU1",
161 .start = 0xffd80014, 157 .start = 0xffd80014,
162 .end = 0xffd8001f, 158 .end = 0xffd8001f,
163 .flags = IORESOURCE_MEM, 159 .flags = IORESOURCE_MEM,
@@ -179,7 +175,6 @@ static struct platform_device tmu1_device = {
179}; 175};
180 176
181static struct sh_timer_config tmu2_platform_data = { 177static struct sh_timer_config tmu2_platform_data = {
182 .name = "TMU2",
183 .channel_offset = 0x1c, 178 .channel_offset = 0x1c,
184 .timer_bit = 2, 179 .timer_bit = 2,
185 .clk = "tmu012_fck", 180 .clk = "tmu012_fck",
@@ -187,7 +182,6 @@ static struct sh_timer_config tmu2_platform_data = {
187 182
188static struct resource tmu2_resources[] = { 183static struct resource tmu2_resources[] = {
189 [0] = { 184 [0] = {
190 .name = "TMU2",
191 .start = 0xffd80020, 185 .start = 0xffd80020,
192 .end = 0xffd8002f, 186 .end = 0xffd8002f,
193 .flags = IORESOURCE_MEM, 187 .flags = IORESOURCE_MEM,
@@ -209,7 +203,6 @@ static struct platform_device tmu2_device = {
209}; 203};
210 204
211static struct sh_timer_config tmu3_platform_data = { 205static struct sh_timer_config tmu3_platform_data = {
212 .name = "TMU3",
213 .channel_offset = 0x04, 206 .channel_offset = 0x04,
214 .timer_bit = 0, 207 .timer_bit = 0,
215 .clk = "tmu345_fck", 208 .clk = "tmu345_fck",
@@ -217,7 +210,6 @@ static struct sh_timer_config tmu3_platform_data = {
217 210
218static struct resource tmu3_resources[] = { 211static struct resource tmu3_resources[] = {
219 [0] = { 212 [0] = {
220 .name = "TMU3",
221 .start = 0xffdc0008, 213 .start = 0xffdc0008,
222 .end = 0xffdc0013, 214 .end = 0xffdc0013,
223 .flags = IORESOURCE_MEM, 215 .flags = IORESOURCE_MEM,
@@ -239,7 +231,6 @@ static struct platform_device tmu3_device = {
239}; 231};
240 232
241static struct sh_timer_config tmu4_platform_data = { 233static struct sh_timer_config tmu4_platform_data = {
242 .name = "TMU4",
243 .channel_offset = 0x10, 234 .channel_offset = 0x10,
244 .timer_bit = 1, 235 .timer_bit = 1,
245 .clk = "tmu345_fck", 236 .clk = "tmu345_fck",
@@ -247,7 +238,6 @@ static struct sh_timer_config tmu4_platform_data = {
247 238
248static struct resource tmu4_resources[] = { 239static struct resource tmu4_resources[] = {
249 [0] = { 240 [0] = {
250 .name = "TMU4",
251 .start = 0xffdc0014, 241 .start = 0xffdc0014,
252 .end = 0xffdc001f, 242 .end = 0xffdc001f,
253 .flags = IORESOURCE_MEM, 243 .flags = IORESOURCE_MEM,
@@ -269,7 +259,6 @@ static struct platform_device tmu4_device = {
269}; 259};
270 260
271static struct sh_timer_config tmu5_platform_data = { 261static struct sh_timer_config tmu5_platform_data = {
272 .name = "TMU5",
273 .channel_offset = 0x1c, 262 .channel_offset = 0x1c,
274 .timer_bit = 2, 263 .timer_bit = 2,
275 .clk = "tmu345_fck", 264 .clk = "tmu345_fck",
@@ -277,7 +266,6 @@ static struct sh_timer_config tmu5_platform_data = {
277 266
278static struct resource tmu5_resources[] = { 267static struct resource tmu5_resources[] = {
279 [0] = { 268 [0] = {
280 .name = "TMU5",
281 .start = 0xffdc0020, 269 .start = 0xffdc0020,
282 .end = 0xffdc002b, 270 .end = 0xffdc002b,
283 .flags = IORESOURCE_MEM, 271 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
index 7e585320710a..542ced88e50f 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
@@ -117,7 +117,6 @@ static struct platform_device scif5_device = {
117}; 117};
118 118
119static struct sh_timer_config tmu0_platform_data = { 119static struct sh_timer_config tmu0_platform_data = {
120 .name = "TMU0",
121 .channel_offset = 0x04, 120 .channel_offset = 0x04,
122 .timer_bit = 0, 121 .timer_bit = 0,
123 .clk = "peripheral_clk", 122 .clk = "peripheral_clk",
@@ -126,7 +125,6 @@ static struct sh_timer_config tmu0_platform_data = {
126 125
127static struct resource tmu0_resources[] = { 126static struct resource tmu0_resources[] = {
128 [0] = { 127 [0] = {
129 .name = "TMU0",
130 .start = 0xffd80008, 128 .start = 0xffd80008,
131 .end = 0xffd80013, 129 .end = 0xffd80013,
132 .flags = IORESOURCE_MEM, 130 .flags = IORESOURCE_MEM,
@@ -148,7 +146,6 @@ static struct platform_device tmu0_device = {
148}; 146};
149 147
150static struct sh_timer_config tmu1_platform_data = { 148static struct sh_timer_config tmu1_platform_data = {
151 .name = "TMU1",
152 .channel_offset = 0x10, 149 .channel_offset = 0x10,
153 .timer_bit = 1, 150 .timer_bit = 1,
154 .clk = "peripheral_clk", 151 .clk = "peripheral_clk",
@@ -157,7 +154,6 @@ static struct sh_timer_config tmu1_platform_data = {
157 154
158static struct resource tmu1_resources[] = { 155static struct resource tmu1_resources[] = {
159 [0] = { 156 [0] = {
160 .name = "TMU1",
161 .start = 0xffd80014, 157 .start = 0xffd80014,
162 .end = 0xffd8001f, 158 .end = 0xffd8001f,
163 .flags = IORESOURCE_MEM, 159 .flags = IORESOURCE_MEM,
@@ -179,7 +175,6 @@ static struct platform_device tmu1_device = {
179}; 175};
180 176
181static struct sh_timer_config tmu2_platform_data = { 177static struct sh_timer_config tmu2_platform_data = {
182 .name = "TMU2",
183 .channel_offset = 0x1c, 178 .channel_offset = 0x1c,
184 .timer_bit = 2, 179 .timer_bit = 2,
185 .clk = "peripheral_clk", 180 .clk = "peripheral_clk",
@@ -187,7 +182,6 @@ static struct sh_timer_config tmu2_platform_data = {
187 182
188static struct resource tmu2_resources[] = { 183static struct resource tmu2_resources[] = {
189 [0] = { 184 [0] = {
190 .name = "TMU2",
191 .start = 0xffd80020, 185 .start = 0xffd80020,
192 .end = 0xffd8002f, 186 .end = 0xffd8002f,
193 .flags = IORESOURCE_MEM, 187 .flags = IORESOURCE_MEM,
@@ -209,7 +203,6 @@ static struct platform_device tmu2_device = {
209}; 203};
210 204
211static struct sh_timer_config tmu3_platform_data = { 205static struct sh_timer_config tmu3_platform_data = {
212 .name = "TMU3",
213 .channel_offset = 0x04, 206 .channel_offset = 0x04,
214 .timer_bit = 0, 207 .timer_bit = 0,
215 .clk = "peripheral_clk", 208 .clk = "peripheral_clk",
@@ -217,7 +210,6 @@ static struct sh_timer_config tmu3_platform_data = {
217 210
218static struct resource tmu3_resources[] = { 211static struct resource tmu3_resources[] = {
219 [0] = { 212 [0] = {
220 .name = "TMU3",
221 .start = 0xffda0008, 213 .start = 0xffda0008,
222 .end = 0xffda0013, 214 .end = 0xffda0013,
223 .flags = IORESOURCE_MEM, 215 .flags = IORESOURCE_MEM,
@@ -239,7 +231,6 @@ static struct platform_device tmu3_device = {
239}; 231};
240 232
241static struct sh_timer_config tmu4_platform_data = { 233static struct sh_timer_config tmu4_platform_data = {
242 .name = "TMU4",
243 .channel_offset = 0x10, 234 .channel_offset = 0x10,
244 .timer_bit = 1, 235 .timer_bit = 1,
245 .clk = "peripheral_clk", 236 .clk = "peripheral_clk",
@@ -247,7 +238,6 @@ static struct sh_timer_config tmu4_platform_data = {
247 238
248static struct resource tmu4_resources[] = { 239static struct resource tmu4_resources[] = {
249 [0] = { 240 [0] = {
250 .name = "TMU4",
251 .start = 0xffda0014, 241 .start = 0xffda0014,
252 .end = 0xffda001f, 242 .end = 0xffda001f,
253 .flags = IORESOURCE_MEM, 243 .flags = IORESOURCE_MEM,
@@ -269,7 +259,6 @@ static struct platform_device tmu4_device = {
269}; 259};
270 260
271static struct sh_timer_config tmu5_platform_data = { 261static struct sh_timer_config tmu5_platform_data = {
272 .name = "TMU5",
273 .channel_offset = 0x1c, 262 .channel_offset = 0x1c,
274 .timer_bit = 2, 263 .timer_bit = 2,
275 .clk = "peripheral_clk", 264 .clk = "peripheral_clk",
@@ -277,7 +266,6 @@ static struct sh_timer_config tmu5_platform_data = {
277 266
278static struct resource tmu5_resources[] = { 267static struct resource tmu5_resources[] = {
279 [0] = { 268 [0] = {
280 .name = "TMU5",
281 .start = 0xffda0020, 269 .start = 0xffda0020,
282 .end = 0xffda002b, 270 .end = 0xffda002b,
283 .flags = IORESOURCE_MEM, 271 .flags = IORESOURCE_MEM,
@@ -299,7 +287,6 @@ static struct platform_device tmu5_device = {
299}; 287};
300 288
301static struct sh_timer_config tmu6_platform_data = { 289static struct sh_timer_config tmu6_platform_data = {
302 .name = "TMU6",
303 .channel_offset = 0x04, 290 .channel_offset = 0x04,
304 .timer_bit = 0, 291 .timer_bit = 0,
305 .clk = "peripheral_clk", 292 .clk = "peripheral_clk",
@@ -307,7 +294,6 @@ static struct sh_timer_config tmu6_platform_data = {
307 294
308static struct resource tmu6_resources[] = { 295static struct resource tmu6_resources[] = {
309 [0] = { 296 [0] = {
310 .name = "TMU6",
311 .start = 0xffdc0008, 297 .start = 0xffdc0008,
312 .end = 0xffdc0013, 298 .end = 0xffdc0013,
313 .flags = IORESOURCE_MEM, 299 .flags = IORESOURCE_MEM,
@@ -329,7 +315,6 @@ static struct platform_device tmu6_device = {
329}; 315};
330 316
331static struct sh_timer_config tmu7_platform_data = { 317static struct sh_timer_config tmu7_platform_data = {
332 .name = "TMU7",
333 .channel_offset = 0x10, 318 .channel_offset = 0x10,
334 .timer_bit = 1, 319 .timer_bit = 1,
335 .clk = "peripheral_clk", 320 .clk = "peripheral_clk",
@@ -337,7 +322,6 @@ static struct sh_timer_config tmu7_platform_data = {
337 322
338static struct resource tmu7_resources[] = { 323static struct resource tmu7_resources[] = {
339 [0] = { 324 [0] = {
340 .name = "TMU7",
341 .start = 0xffdc0014, 325 .start = 0xffdc0014,
342 .end = 0xffdc001f, 326 .end = 0xffdc001f,
343 .flags = IORESOURCE_MEM, 327 .flags = IORESOURCE_MEM,
@@ -359,7 +343,6 @@ static struct platform_device tmu7_device = {
359}; 343};
360 344
361static struct sh_timer_config tmu8_platform_data = { 345static struct sh_timer_config tmu8_platform_data = {
362 .name = "TMU8",
363 .channel_offset = 0x1c, 346 .channel_offset = 0x1c,
364 .timer_bit = 2, 347 .timer_bit = 2,
365 .clk = "peripheral_clk", 348 .clk = "peripheral_clk",
@@ -367,7 +350,6 @@ static struct sh_timer_config tmu8_platform_data = {
367 350
368static struct resource tmu8_resources[] = { 351static struct resource tmu8_resources[] = {
369 [0] = { 352 [0] = {
370 .name = "TMU8",
371 .start = 0xffdc0020, 353 .start = 0xffdc0020,
372 .end = 0xffdc002b, 354 .end = 0xffdc002b,
373 .flags = IORESOURCE_MEM, 355 .flags = IORESOURCE_MEM,
@@ -389,7 +371,6 @@ static struct platform_device tmu8_device = {
389}; 371};
390 372
391static struct sh_timer_config tmu9_platform_data = { 373static struct sh_timer_config tmu9_platform_data = {
392 .name = "TMU9",
393 .channel_offset = 0x04, 374 .channel_offset = 0x04,
394 .timer_bit = 0, 375 .timer_bit = 0,
395 .clk = "peripheral_clk", 376 .clk = "peripheral_clk",
@@ -397,7 +378,6 @@ static struct sh_timer_config tmu9_platform_data = {
397 378
398static struct resource tmu9_resources[] = { 379static struct resource tmu9_resources[] = {
399 [0] = { 380 [0] = {
400 .name = "TMU9",
401 .start = 0xffde0008, 381 .start = 0xffde0008,
402 .end = 0xffde0013, 382 .end = 0xffde0013,
403 .flags = IORESOURCE_MEM, 383 .flags = IORESOURCE_MEM,
@@ -419,7 +399,6 @@ static struct platform_device tmu9_device = {
419}; 399};
420 400
421static struct sh_timer_config tmu10_platform_data = { 401static struct sh_timer_config tmu10_platform_data = {
422 .name = "TMU10",
423 .channel_offset = 0x10, 402 .channel_offset = 0x10,
424 .timer_bit = 1, 403 .timer_bit = 1,
425 .clk = "peripheral_clk", 404 .clk = "peripheral_clk",
@@ -427,7 +406,6 @@ static struct sh_timer_config tmu10_platform_data = {
427 406
428static struct resource tmu10_resources[] = { 407static struct resource tmu10_resources[] = {
429 [0] = { 408 [0] = {
430 .name = "TMU10",
431 .start = 0xffde0014, 409 .start = 0xffde0014,
432 .end = 0xffde001f, 410 .end = 0xffde001f,
433 .flags = IORESOURCE_MEM, 411 .flags = IORESOURCE_MEM,
@@ -449,7 +427,6 @@ static struct platform_device tmu10_device = {
449}; 427};
450 428
451static struct sh_timer_config tmu11_platform_data = { 429static struct sh_timer_config tmu11_platform_data = {
452 .name = "TMU11",
453 .channel_offset = 0x1c, 430 .channel_offset = 0x1c,
454 .timer_bit = 2, 431 .timer_bit = 2,
455 .clk = "peripheral_clk", 432 .clk = "peripheral_clk",
@@ -457,7 +434,6 @@ static struct sh_timer_config tmu11_platform_data = {
457 434
458static struct resource tmu11_resources[] = { 435static struct resource tmu11_resources[] = {
459 [0] = { 436 [0] = {
460 .name = "TMU11",
461 .start = 0xffde0020, 437 .start = 0xffde0020,
462 .end = 0xffde002b, 438 .end = 0xffde002b,
463 .flags = IORESOURCE_MEM, 439 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index 780ba17a5599..ba545b5ccc15 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -70,7 +70,6 @@ static struct platform_device scif2_device = {
70}; 70};
71 71
72static struct sh_timer_config tmu0_platform_data = { 72static struct sh_timer_config tmu0_platform_data = {
73 .name = "TMU0",
74 .channel_offset = 0x04, 73 .channel_offset = 0x04,
75 .timer_bit = 0, 74 .timer_bit = 0,
76 .clk = "peripheral_clk", 75 .clk = "peripheral_clk",
@@ -79,7 +78,6 @@ static struct sh_timer_config tmu0_platform_data = {
79 78
80static struct resource tmu0_resources[] = { 79static struct resource tmu0_resources[] = {
81 [0] = { 80 [0] = {
82 .name = "TMU0",
83 .start = 0xffc10008, 81 .start = 0xffc10008,
84 .end = 0xffc10013, 82 .end = 0xffc10013,
85 .flags = IORESOURCE_MEM, 83 .flags = IORESOURCE_MEM,
@@ -101,7 +99,6 @@ static struct platform_device tmu0_device = {
101}; 99};
102 100
103static struct sh_timer_config tmu1_platform_data = { 101static struct sh_timer_config tmu1_platform_data = {
104 .name = "TMU1",
105 .channel_offset = 0x10, 102 .channel_offset = 0x10,
106 .timer_bit = 1, 103 .timer_bit = 1,
107 .clk = "peripheral_clk", 104 .clk = "peripheral_clk",
@@ -110,7 +107,6 @@ static struct sh_timer_config tmu1_platform_data = {
110 107
111static struct resource tmu1_resources[] = { 108static struct resource tmu1_resources[] = {
112 [0] = { 109 [0] = {
113 .name = "TMU1",
114 .start = 0xffc10014, 110 .start = 0xffc10014,
115 .end = 0xffc1001f, 111 .end = 0xffc1001f,
116 .flags = IORESOURCE_MEM, 112 .flags = IORESOURCE_MEM,
@@ -132,7 +128,6 @@ static struct platform_device tmu1_device = {
132}; 128};
133 129
134static struct sh_timer_config tmu2_platform_data = { 130static struct sh_timer_config tmu2_platform_data = {
135 .name = "TMU2",
136 .channel_offset = 0x1c, 131 .channel_offset = 0x1c,
137 .timer_bit = 2, 132 .timer_bit = 2,
138 .clk = "peripheral_clk", 133 .clk = "peripheral_clk",
@@ -140,7 +135,6 @@ static struct sh_timer_config tmu2_platform_data = {
140 135
141static struct resource tmu2_resources[] = { 136static struct resource tmu2_resources[] = {
142 [0] = { 137 [0] = {
143 .name = "TMU2",
144 .start = 0xffc10020, 138 .start = 0xffc10020,
145 .end = 0xffc1002f, 139 .end = 0xffc1002f,
146 .flags = IORESOURCE_MEM, 140 .flags = IORESOURCE_MEM,
@@ -162,7 +156,6 @@ static struct platform_device tmu2_device = {
162}; 156};
163 157
164static struct sh_timer_config tmu3_platform_data = { 158static struct sh_timer_config tmu3_platform_data = {
165 .name = "TMU3",
166 .channel_offset = 0x04, 159 .channel_offset = 0x04,
167 .timer_bit = 0, 160 .timer_bit = 0,
168 .clk = "peripheral_clk", 161 .clk = "peripheral_clk",
@@ -170,7 +163,6 @@ static struct sh_timer_config tmu3_platform_data = {
170 163
171static struct resource tmu3_resources[] = { 164static struct resource tmu3_resources[] = {
172 [0] = { 165 [0] = {
173 .name = "TMU3",
174 .start = 0xffc20008, 166 .start = 0xffc20008,
175 .end = 0xffc20013, 167 .end = 0xffc20013,
176 .flags = IORESOURCE_MEM, 168 .flags = IORESOURCE_MEM,
@@ -192,7 +184,6 @@ static struct platform_device tmu3_device = {
192}; 184};
193 185
194static struct sh_timer_config tmu4_platform_data = { 186static struct sh_timer_config tmu4_platform_data = {
195 .name = "TMU4",
196 .channel_offset = 0x10, 187 .channel_offset = 0x10,
197 .timer_bit = 1, 188 .timer_bit = 1,
198 .clk = "peripheral_clk", 189 .clk = "peripheral_clk",
@@ -200,7 +191,6 @@ static struct sh_timer_config tmu4_platform_data = {
200 191
201static struct resource tmu4_resources[] = { 192static struct resource tmu4_resources[] = {
202 [0] = { 193 [0] = {
203 .name = "TMU4",
204 .start = 0xffc20014, 194 .start = 0xffc20014,
205 .end = 0xffc2001f, 195 .end = 0xffc2001f,
206 .flags = IORESOURCE_MEM, 196 .flags = IORESOURCE_MEM,
@@ -222,7 +212,6 @@ static struct platform_device tmu4_device = {
222}; 212};
223 213
224static struct sh_timer_config tmu5_platform_data = { 214static struct sh_timer_config tmu5_platform_data = {
225 .name = "TMU5",
226 .channel_offset = 0x1c, 215 .channel_offset = 0x1c,
227 .timer_bit = 2, 216 .timer_bit = 2,
228 .clk = "peripheral_clk", 217 .clk = "peripheral_clk",
@@ -230,7 +219,6 @@ static struct sh_timer_config tmu5_platform_data = {
230 219
231static struct resource tmu5_resources[] = { 220static struct resource tmu5_resources[] = {
232 [0] = { 221 [0] = {
233 .name = "TMU5",
234 .start = 0xffc20020, 222 .start = 0xffc20020,
235 .end = 0xffc2002b, 223 .end = 0xffc2002b,
236 .flags = IORESOURCE_MEM, 224 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c
index e7a3c1e4b604..c84ca204240b 100644
--- a/arch/sh/kernel/cpu/sh5/setup-sh5.c
+++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c
@@ -68,7 +68,6 @@ static struct platform_device rtc_device = {
68#define TMU2_BASE (TMU_BASE + 0x8 + (0xc * 0x2)) 68#define TMU2_BASE (TMU_BASE + 0x8 + (0xc * 0x2))
69 69
70static struct sh_timer_config tmu0_platform_data = { 70static struct sh_timer_config tmu0_platform_data = {
71 .name = "TMU0",
72 .channel_offset = 0x04, 71 .channel_offset = 0x04,
73 .timer_bit = 0, 72 .timer_bit = 0,
74 .clk = "peripheral_clk", 73 .clk = "peripheral_clk",
@@ -77,7 +76,6 @@ static struct sh_timer_config tmu0_platform_data = {
77 76
78static struct resource tmu0_resources[] = { 77static struct resource tmu0_resources[] = {
79 [0] = { 78 [0] = {
80 .name = "TMU0",
81 .start = TMU0_BASE, 79 .start = TMU0_BASE,
82 .end = TMU0_BASE + 0xc - 1, 80 .end = TMU0_BASE + 0xc - 1,
83 .flags = IORESOURCE_MEM, 81 .flags = IORESOURCE_MEM,
@@ -99,7 +97,6 @@ static struct platform_device tmu0_device = {
99}; 97};
100 98
101static struct sh_timer_config tmu1_platform_data = { 99static struct sh_timer_config tmu1_platform_data = {
102 .name = "TMU1",
103 .channel_offset = 0x10, 100 .channel_offset = 0x10,
104 .timer_bit = 1, 101 .timer_bit = 1,
105 .clk = "peripheral_clk", 102 .clk = "peripheral_clk",
@@ -108,7 +105,6 @@ static struct sh_timer_config tmu1_platform_data = {
108 105
109static struct resource tmu1_resources[] = { 106static struct resource tmu1_resources[] = {
110 [0] = { 107 [0] = {
111 .name = "TMU1",
112 .start = TMU1_BASE, 108 .start = TMU1_BASE,
113 .end = TMU1_BASE + 0xc - 1, 109 .end = TMU1_BASE + 0xc - 1,
114 .flags = IORESOURCE_MEM, 110 .flags = IORESOURCE_MEM,
@@ -130,7 +126,6 @@ static struct platform_device tmu1_device = {
130}; 126};
131 127
132static struct sh_timer_config tmu2_platform_data = { 128static struct sh_timer_config tmu2_platform_data = {
133 .name = "TMU2",
134 .channel_offset = 0x1c, 129 .channel_offset = 0x1c,
135 .timer_bit = 2, 130 .timer_bit = 2,
136 .clk = "peripheral_clk", 131 .clk = "peripheral_clk",
@@ -138,7 +133,6 @@ static struct sh_timer_config tmu2_platform_data = {
138 133
139static struct resource tmu2_resources[] = { 134static struct resource tmu2_resources[] = {
140 [0] = { 135 [0] = {
141 .name = "TMU2",
142 .start = TMU2_BASE, 136 .start = TMU2_BASE,
143 .end = TMU2_BASE + 0xc - 1, 137 .end = TMU2_BASE + 0xc - 1,
144 .flags = IORESOURCE_MEM, 138 .flags = IORESOURCE_MEM,