diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:28:16 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:28:16 -0500 |
commit | ec0ffe2ee0e0fb9da4409d86bfd72636450f32df (patch) | |
tree | 75ec1d3de64fbadb5ebe5179926eb608dcfb81b6 /arch/sh/kernel/cpu/sh3 | |
parent | 214a607a4f5bf5a14dab0304ba350cdaf3916795 (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>
Diffstat (limited to 'arch/sh/kernel/cpu/sh3')
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7705.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh770x.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7710.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7720.c | 16 |
4 files changed, 0 insertions, 34 deletions
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c index 7b892d60e3a..5e45fb7338f 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 | ||
126 | static struct sh_timer_config tmu0_platform_data = { | 126 | static 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 | ||
134 | static struct resource tmu0_resources[] = { | 133 | static 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 | ||
157 | static struct sh_timer_config tmu1_platform_data = { | 155 | static 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 | ||
165 | static struct resource tmu1_resources[] = { | 162 | static 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 | ||
188 | static struct sh_timer_config tmu2_platform_data = { | 184 | static 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 | ||
195 | static struct resource tmu2_resources[] = { | 190 | static 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 bc0c4f68c7c..9adb853a918 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 | ||
159 | static struct sh_timer_config tmu0_platform_data = { | 159 | static 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 | ||
167 | static struct resource tmu0_resources[] = { | 166 | static 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 | ||
190 | static struct sh_timer_config tmu1_platform_data = { | 188 | static 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 | ||
198 | static struct resource tmu1_resources[] = { | 195 | static 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 | ||
221 | static struct sh_timer_config tmu2_platform_data = { | 217 | static 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 | ||
228 | static struct resource tmu2_resources[] = { | 223 | static 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 0845a3ad006..2e581e30d13 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 | ||
129 | static struct sh_timer_config tmu0_platform_data = { | 129 | static 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 | ||
137 | static struct resource tmu0_resources[] = { | 136 | static 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 | ||
160 | static struct sh_timer_config tmu1_platform_data = { | 158 | static 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 | ||
168 | static struct resource tmu1_resources[] = { | 165 | static 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 | ||
191 | static struct sh_timer_config tmu2_platform_data = { | 187 | static 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 | ||
198 | static struct resource tmu2_resources[] = { | 193 | static 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 a718a623109..9a006e13b41 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 | ||
132 | static struct sh_timer_config cmt0_platform_data = { | 132 | static 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 | ||
141 | static struct resource cmt0_resources[] = { | 140 | static 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 | ||
164 | static struct sh_timer_config cmt1_platform_data = { | 162 | static 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 | ||
171 | static struct resource cmt1_resources[] = { | 168 | static 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 | ||
194 | static struct sh_timer_config cmt2_platform_data = { | 190 | static 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 | ||
201 | static struct resource cmt2_resources[] = { | 196 | static 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 | ||
224 | static struct sh_timer_config cmt3_platform_data = { | 218 | static 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 | ||
231 | static struct resource cmt3_resources[] = { | 224 | static 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 | ||
254 | static struct sh_timer_config cmt4_platform_data = { | 246 | static 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 | ||
261 | static struct resource cmt4_resources[] = { | 252 | static 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 | ||
284 | static struct sh_timer_config tmu0_platform_data = { | 274 | static 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 | ||
292 | static struct resource tmu0_resources[] = { | 281 | static 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 | ||
315 | static struct sh_timer_config tmu1_platform_data = { | 303 | static 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 | ||
323 | static struct resource tmu1_resources[] = { | 310 | static 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 | ||
346 | static struct sh_timer_config tmu2_platform_data = { | 332 | static 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 | ||
353 | static struct resource tmu2_resources[] = { | 338 | static 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, |