diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-13 03:59:40 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-13 03:59:40 -0400 |
commit | af777ce42d3d51cdef353ce296d6f99dc503feef (patch) | |
tree | d0f1f8d9b485da129b0298fd0d74ab8c829884e0 /arch/sh/kernel | |
parent | fd5b12458b25a88eb6f6b56464846d98a45e8928 (diff) |
sh: clkfwk: module_clk -> peripheral_clk rename.
For consistenct naming, and to allow us to fix up some confusion in the
SH-Mobile clock framework, amongst other places.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/cpu/clock.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2/setup-sh7619.c | 4 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-mxg.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 8 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 10 | ||||
-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 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 10 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7760.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 12 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 18 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 12 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 12 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 24 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-shx3.c | 12 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh5/setup-sh5.c | 6 |
20 files changed, 96 insertions, 96 deletions
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index 61ff227561dc..0eedf9392647 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c | |||
@@ -50,8 +50,8 @@ static struct clk master_clk = { | |||
50 | .rate = CONFIG_SH_PCLK_FREQ, | 50 | .rate = CONFIG_SH_PCLK_FREQ, |
51 | }; | 51 | }; |
52 | 52 | ||
53 | static struct clk module_clk = { | 53 | static struct clk peripheral_clk = { |
54 | .name = "module_clk", | 54 | .name = "peripheral_clk", |
55 | .parent = &master_clk, | 55 | .parent = &master_clk, |
56 | .flags = CLK_ENABLE_ON_INIT, | 56 | .flags = CLK_ENABLE_ON_INIT, |
57 | }; | 57 | }; |
@@ -73,7 +73,7 @@ static struct clk cpu_clk = { | |||
73 | */ | 73 | */ |
74 | static struct clk *onchip_clocks[] = { | 74 | static struct clk *onchip_clocks[] = { |
75 | &master_clk, | 75 | &master_clk, |
76 | &module_clk, | 76 | &peripheral_clk, |
77 | &bus_clk, | 77 | &bus_clk, |
78 | &cpu_clk, | 78 | &cpu_clk, |
79 | }; | 79 | }; |
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c index 94ac27fc2237..13798733f2db 100644 --- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c | |||
@@ -115,7 +115,7 @@ static struct sh_timer_config cmt0_platform_data = { | |||
115 | .name = "CMT0", | 115 | .name = "CMT0", |
116 | .channel_offset = 0x02, | 116 | .channel_offset = 0x02, |
117 | .timer_bit = 0, | 117 | .timer_bit = 0, |
118 | .clk = "module_clk", | 118 | .clk = "peripheral_clk", |
119 | .clockevent_rating = 125, | 119 | .clockevent_rating = 125, |
120 | .clocksource_rating = 0, /* disabled due to code generation issues */ | 120 | .clocksource_rating = 0, /* disabled due to code generation issues */ |
121 | }; | 121 | }; |
@@ -147,7 +147,7 @@ static struct sh_timer_config cmt1_platform_data = { | |||
147 | .name = "CMT1", | 147 | .name = "CMT1", |
148 | .channel_offset = 0x08, | 148 | .channel_offset = 0x08, |
149 | .timer_bit = 1, | 149 | .timer_bit = 1, |
150 | .clk = "module_clk", | 150 | .clk = "peripheral_clk", |
151 | .clockevent_rating = 125, | 151 | .clockevent_rating = 125, |
152 | .clocksource_rating = 0, /* disabled due to code generation issues */ | 152 | .clocksource_rating = 0, /* disabled due to code generation issues */ |
153 | }; | 153 | }; |
diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c index a452d9649069..869c2da4820b 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c +++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c | |||
@@ -118,7 +118,7 @@ static struct sh_timer_config mtu2_0_platform_data = { | |||
118 | .name = "MTU2_0", | 118 | .name = "MTU2_0", |
119 | .channel_offset = -0x80, | 119 | .channel_offset = -0x80, |
120 | .timer_bit = 0, | 120 | .timer_bit = 0, |
121 | .clk = "module_clk", | 121 | .clk = "peripheral_clk", |
122 | .clockevent_rating = 200, | 122 | .clockevent_rating = 200, |
123 | }; | 123 | }; |
124 | 124 | ||
@@ -149,7 +149,7 @@ static struct sh_timer_config mtu2_1_platform_data = { | |||
149 | .name = "MTU2_1", | 149 | .name = "MTU2_1", |
150 | .channel_offset = -0x100, | 150 | .channel_offset = -0x100, |
151 | .timer_bit = 1, | 151 | .timer_bit = 1, |
152 | .clk = "module_clk", | 152 | .clk = "peripheral_clk", |
153 | .clockevent_rating = 200, | 153 | .clockevent_rating = 200, |
154 | }; | 154 | }; |
155 | 155 | ||
@@ -180,7 +180,7 @@ static struct sh_timer_config mtu2_2_platform_data = { | |||
180 | .name = "MTU2_2", | 180 | .name = "MTU2_2", |
181 | .channel_offset = 0x80, | 181 | .channel_offset = 0x80, |
182 | .timer_bit = 2, | 182 | .timer_bit = 2, |
183 | .clk = "module_clk", | 183 | .clk = "peripheral_clk", |
184 | .clockevent_rating = 200, | 184 | .clockevent_rating = 200, |
185 | }; | 185 | }; |
186 | 186 | ||
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c index 772358b7685e..d8febe128066 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c | |||
@@ -255,7 +255,7 @@ static struct sh_timer_config mtu2_0_platform_data = { | |||
255 | .name = "MTU2_0", | 255 | .name = "MTU2_0", |
256 | .channel_offset = -0x80, | 256 | .channel_offset = -0x80, |
257 | .timer_bit = 0, | 257 | .timer_bit = 0, |
258 | .clk = "module_clk", | 258 | .clk = "peripheral_clk", |
259 | .clockevent_rating = 200, | 259 | .clockevent_rating = 200, |
260 | }; | 260 | }; |
261 | 261 | ||
@@ -286,7 +286,7 @@ static struct sh_timer_config mtu2_1_platform_data = { | |||
286 | .name = "MTU2_1", | 286 | .name = "MTU2_1", |
287 | .channel_offset = -0x100, | 287 | .channel_offset = -0x100, |
288 | .timer_bit = 1, | 288 | .timer_bit = 1, |
289 | .clk = "module_clk", | 289 | .clk = "peripheral_clk", |
290 | .clockevent_rating = 200, | 290 | .clockevent_rating = 200, |
291 | }; | 291 | }; |
292 | 292 | ||
@@ -317,7 +317,7 @@ static struct sh_timer_config mtu2_2_platform_data = { | |||
317 | .name = "MTU2_2", | 317 | .name = "MTU2_2", |
318 | .channel_offset = 0x80, | 318 | .channel_offset = 0x80, |
319 | .timer_bit = 2, | 319 | .timer_bit = 2, |
320 | .clk = "module_clk", | 320 | .clk = "peripheral_clk", |
321 | .clockevent_rating = 200, | 321 | .clockevent_rating = 200, |
322 | }; | 322 | }; |
323 | 323 | ||
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c index d7493418ba60..62e3039d2398 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c | |||
@@ -211,7 +211,7 @@ static struct sh_timer_config cmt0_platform_data = { | |||
211 | .name = "CMT0", | 211 | .name = "CMT0", |
212 | .channel_offset = 0x02, | 212 | .channel_offset = 0x02, |
213 | .timer_bit = 0, | 213 | .timer_bit = 0, |
214 | .clk = "module_clk", | 214 | .clk = "peripheral_clk", |
215 | .clockevent_rating = 125, | 215 | .clockevent_rating = 125, |
216 | .clocksource_rating = 0, /* disabled due to code generation issues */ | 216 | .clocksource_rating = 0, /* disabled due to code generation issues */ |
217 | }; | 217 | }; |
@@ -243,7 +243,7 @@ static struct sh_timer_config cmt1_platform_data = { | |||
243 | .name = "CMT1", | 243 | .name = "CMT1", |
244 | .channel_offset = 0x08, | 244 | .channel_offset = 0x08, |
245 | .timer_bit = 1, | 245 | .timer_bit = 1, |
246 | .clk = "module_clk", | 246 | .clk = "peripheral_clk", |
247 | .clockevent_rating = 125, | 247 | .clockevent_rating = 125, |
248 | .clocksource_rating = 0, /* disabled due to code generation issues */ | 248 | .clocksource_rating = 0, /* disabled due to code generation issues */ |
249 | }; | 249 | }; |
@@ -275,7 +275,7 @@ static struct sh_timer_config mtu2_0_platform_data = { | |||
275 | .name = "MTU2_0", | 275 | .name = "MTU2_0", |
276 | .channel_offset = -0x80, | 276 | .channel_offset = -0x80, |
277 | .timer_bit = 0, | 277 | .timer_bit = 0, |
278 | .clk = "module_clk", | 278 | .clk = "peripheral_clk", |
279 | .clockevent_rating = 200, | 279 | .clockevent_rating = 200, |
280 | }; | 280 | }; |
281 | 281 | ||
@@ -306,7 +306,7 @@ static struct sh_timer_config mtu2_1_platform_data = { | |||
306 | .name = "MTU2_1", | 306 | .name = "MTU2_1", |
307 | .channel_offset = -0x100, | 307 | .channel_offset = -0x100, |
308 | .timer_bit = 1, | 308 | .timer_bit = 1, |
309 | .clk = "module_clk", | 309 | .clk = "peripheral_clk", |
310 | .clockevent_rating = 200, | 310 | .clockevent_rating = 200, |
311 | }; | 311 | }; |
312 | 312 | ||
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c index 2fc6bff5c5fb..3e6f3d7a58be 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c | |||
@@ -171,7 +171,7 @@ static struct sh_timer_config cmt0_platform_data = { | |||
171 | .name = "CMT0", | 171 | .name = "CMT0", |
172 | .channel_offset = 0x02, | 172 | .channel_offset = 0x02, |
173 | .timer_bit = 0, | 173 | .timer_bit = 0, |
174 | .clk = "module_clk", | 174 | .clk = "peripheral_clk", |
175 | .clockevent_rating = 125, | 175 | .clockevent_rating = 125, |
176 | .clocksource_rating = 0, /* disabled due to code generation issues */ | 176 | .clocksource_rating = 0, /* disabled due to code generation issues */ |
177 | }; | 177 | }; |
@@ -203,7 +203,7 @@ static struct sh_timer_config cmt1_platform_data = { | |||
203 | .name = "CMT1", | 203 | .name = "CMT1", |
204 | .channel_offset = 0x08, | 204 | .channel_offset = 0x08, |
205 | .timer_bit = 1, | 205 | .timer_bit = 1, |
206 | .clk = "module_clk", | 206 | .clk = "peripheral_clk", |
207 | .clockevent_rating = 125, | 207 | .clockevent_rating = 125, |
208 | .clocksource_rating = 0, /* disabled due to code generation issues */ | 208 | .clocksource_rating = 0, /* disabled due to code generation issues */ |
209 | }; | 209 | }; |
@@ -235,7 +235,7 @@ static struct sh_timer_config mtu2_0_platform_data = { | |||
235 | .name = "MTU2_0", | 235 | .name = "MTU2_0", |
236 | .channel_offset = -0x80, | 236 | .channel_offset = -0x80, |
237 | .timer_bit = 0, | 237 | .timer_bit = 0, |
238 | .clk = "module_clk", | 238 | .clk = "peripheral_clk", |
239 | .clockevent_rating = 200, | 239 | .clockevent_rating = 200, |
240 | }; | 240 | }; |
241 | 241 | ||
@@ -266,7 +266,7 @@ static struct sh_timer_config mtu2_1_platform_data = { | |||
266 | .name = "MTU2_1", | 266 | .name = "MTU2_1", |
267 | .channel_offset = -0x100, | 267 | .channel_offset = -0x100, |
268 | .timer_bit = 1, | 268 | .timer_bit = 1, |
269 | .clk = "module_clk", | 269 | .clk = "peripheral_clk", |
270 | .clockevent_rating = 200, | 270 | .clockevent_rating = 200, |
271 | }; | 271 | }; |
272 | 272 | ||
@@ -297,7 +297,7 @@ static struct sh_timer_config mtu2_2_platform_data = { | |||
297 | .name = "MTU2_2", | 297 | .name = "MTU2_2", |
298 | .channel_offset = 0x80, | 298 | .channel_offset = 0x80, |
299 | .timer_bit = 2, | 299 | .timer_bit = 2, |
300 | .clk = "module_clk", | 300 | .clk = "peripheral_clk", |
301 | .clockevent_rating = 200, | 301 | .clockevent_rating = 200, |
302 | }; | 302 | }; |
303 | 303 | ||
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c index 39513664d5d7..88f742fed9ed 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c | |||
@@ -121,7 +121,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
121 | .name = "TMU0", | 121 | .name = "TMU0", |
122 | .channel_offset = 0x02, | 122 | .channel_offset = 0x02, |
123 | .timer_bit = 0, | 123 | .timer_bit = 0, |
124 | .clk = "module_clk", | 124 | .clk = "peripheral_clk", |
125 | .clockevent_rating = 200, | 125 | .clockevent_rating = 200, |
126 | }; | 126 | }; |
127 | 127 | ||
@@ -152,7 +152,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
152 | .name = "TMU1", | 152 | .name = "TMU1", |
153 | .channel_offset = 0xe, | 153 | .channel_offset = 0xe, |
154 | .timer_bit = 1, | 154 | .timer_bit = 1, |
155 | .clk = "module_clk", | 155 | .clk = "peripheral_clk", |
156 | .clocksource_rating = 200, | 156 | .clocksource_rating = 200, |
157 | }; | 157 | }; |
158 | 158 | ||
@@ -183,7 +183,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
183 | .name = "TMU2", | 183 | .name = "TMU2", |
184 | .channel_offset = 0x1a, | 184 | .channel_offset = 0x1a, |
185 | .timer_bit = 2, | 185 | .timer_bit = 2, |
186 | .clk = "module_clk", | 186 | .clk = "peripheral_clk", |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static struct resource tmu2_resources[] = { | 189 | static struct resource tmu2_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c index 9412d915b84e..c56306798584 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c | |||
@@ -149,7 +149,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
149 | .name = "TMU0", | 149 | .name = "TMU0", |
150 | .channel_offset = 0x02, | 150 | .channel_offset = 0x02, |
151 | .timer_bit = 0, | 151 | .timer_bit = 0, |
152 | .clk = "module_clk", | 152 | .clk = "peripheral_clk", |
153 | .clockevent_rating = 200, | 153 | .clockevent_rating = 200, |
154 | }; | 154 | }; |
155 | 155 | ||
@@ -180,7 +180,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
180 | .name = "TMU1", | 180 | .name = "TMU1", |
181 | .channel_offset = 0xe, | 181 | .channel_offset = 0xe, |
182 | .timer_bit = 1, | 182 | .timer_bit = 1, |
183 | .clk = "module_clk", | 183 | .clk = "peripheral_clk", |
184 | .clocksource_rating = 200, | 184 | .clocksource_rating = 200, |
185 | }; | 185 | }; |
186 | 186 | ||
@@ -211,7 +211,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
211 | .name = "TMU2", | 211 | .name = "TMU2", |
212 | .channel_offset = 0x1a, | 212 | .channel_offset = 0x1a, |
213 | .timer_bit = 2, | 213 | .timer_bit = 2, |
214 | .clk = "module_clk", | 214 | .clk = "peripheral_clk", |
215 | }; | 215 | }; |
216 | 216 | ||
217 | static struct resource tmu2_resources[] = { | 217 | static struct resource tmu2_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c index 07ff38d055a7..efa76c8148f4 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c | |||
@@ -125,7 +125,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
125 | .name = "TMU0", | 125 | .name = "TMU0", |
126 | .channel_offset = 0x02, | 126 | .channel_offset = 0x02, |
127 | .timer_bit = 0, | 127 | .timer_bit = 0, |
128 | .clk = "module_clk", | 128 | .clk = "peripheral_clk", |
129 | .clockevent_rating = 200, | 129 | .clockevent_rating = 200, |
130 | }; | 130 | }; |
131 | 131 | ||
@@ -156,7 +156,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
156 | .name = "TMU1", | 156 | .name = "TMU1", |
157 | .channel_offset = 0xe, | 157 | .channel_offset = 0xe, |
158 | .timer_bit = 1, | 158 | .timer_bit = 1, |
159 | .clk = "module_clk", | 159 | .clk = "peripheral_clk", |
160 | .clocksource_rating = 200, | 160 | .clocksource_rating = 200, |
161 | }; | 161 | }; |
162 | 162 | ||
@@ -187,7 +187,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
187 | .name = "TMU2", | 187 | .name = "TMU2", |
188 | .channel_offset = 0x1a, | 188 | .channel_offset = 0x1a, |
189 | .timer_bit = 2, | 189 | .timer_bit = 2, |
190 | .clk = "module_clk", | 190 | .clk = "peripheral_clk", |
191 | }; | 191 | }; |
192 | 192 | ||
193 | static struct resource tmu2_resources[] = { | 193 | static struct resource tmu2_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c index d8b46f5dff60..5b2107798edb 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c | |||
@@ -128,7 +128,7 @@ static struct sh_timer_config cmt0_platform_data = { | |||
128 | .name = "CMT0", | 128 | .name = "CMT0", |
129 | .channel_offset = 0x10, | 129 | .channel_offset = 0x10, |
130 | .timer_bit = 0, | 130 | .timer_bit = 0, |
131 | .clk = "module_clk", | 131 | .clk = "peripheral_clk", |
132 | .clockevent_rating = 125, | 132 | .clockevent_rating = 125, |
133 | .clocksource_rating = 125, | 133 | .clocksource_rating = 125, |
134 | }; | 134 | }; |
@@ -160,7 +160,7 @@ static struct sh_timer_config cmt1_platform_data = { | |||
160 | .name = "CMT1", | 160 | .name = "CMT1", |
161 | .channel_offset = 0x20, | 161 | .channel_offset = 0x20, |
162 | .timer_bit = 1, | 162 | .timer_bit = 1, |
163 | .clk = "module_clk", | 163 | .clk = "peripheral_clk", |
164 | }; | 164 | }; |
165 | 165 | ||
166 | static struct resource cmt1_resources[] = { | 166 | static struct resource cmt1_resources[] = { |
@@ -190,7 +190,7 @@ static struct sh_timer_config cmt2_platform_data = { | |||
190 | .name = "CMT2", | 190 | .name = "CMT2", |
191 | .channel_offset = 0x30, | 191 | .channel_offset = 0x30, |
192 | .timer_bit = 2, | 192 | .timer_bit = 2, |
193 | .clk = "module_clk", | 193 | .clk = "peripheral_clk", |
194 | }; | 194 | }; |
195 | 195 | ||
196 | static struct resource cmt2_resources[] = { | 196 | static struct resource cmt2_resources[] = { |
@@ -220,7 +220,7 @@ static struct sh_timer_config cmt3_platform_data = { | |||
220 | .name = "CMT3", | 220 | .name = "CMT3", |
221 | .channel_offset = 0x40, | 221 | .channel_offset = 0x40, |
222 | .timer_bit = 3, | 222 | .timer_bit = 3, |
223 | .clk = "module_clk", | 223 | .clk = "peripheral_clk", |
224 | }; | 224 | }; |
225 | 225 | ||
226 | static struct resource cmt3_resources[] = { | 226 | static struct resource cmt3_resources[] = { |
@@ -250,7 +250,7 @@ static struct sh_timer_config cmt4_platform_data = { | |||
250 | .name = "CMT4", | 250 | .name = "CMT4", |
251 | .channel_offset = 0x50, | 251 | .channel_offset = 0x50, |
252 | .timer_bit = 4, | 252 | .timer_bit = 4, |
253 | .clk = "module_clk", | 253 | .clk = "peripheral_clk", |
254 | }; | 254 | }; |
255 | 255 | ||
256 | static struct resource cmt4_resources[] = { | 256 | static struct resource cmt4_resources[] = { |
@@ -280,7 +280,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
280 | .name = "TMU0", | 280 | .name = "TMU0", |
281 | .channel_offset = 0x02, | 281 | .channel_offset = 0x02, |
282 | .timer_bit = 0, | 282 | .timer_bit = 0, |
283 | .clk = "module_clk", | 283 | .clk = "peripheral_clk", |
284 | .clockevent_rating = 200, | 284 | .clockevent_rating = 200, |
285 | }; | 285 | }; |
286 | 286 | ||
@@ -311,7 +311,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
311 | .name = "TMU1", | 311 | .name = "TMU1", |
312 | .channel_offset = 0xe, | 312 | .channel_offset = 0xe, |
313 | .timer_bit = 1, | 313 | .timer_bit = 1, |
314 | .clk = "module_clk", | 314 | .clk = "peripheral_clk", |
315 | .clocksource_rating = 200, | 315 | .clocksource_rating = 200, |
316 | }; | 316 | }; |
317 | 317 | ||
@@ -342,7 +342,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
342 | .name = "TMU2", | 342 | .name = "TMU2", |
343 | .channel_offset = 0x1a, | 343 | .channel_offset = 0x1a, |
344 | .timer_bit = 2, | 344 | .timer_bit = 2, |
345 | .clk = "module_clk", | 345 | .clk = "peripheral_clk", |
346 | }; | 346 | }; |
347 | 347 | ||
348 | static struct resource tmu2_resources[] = { | 348 | static struct resource tmu2_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c index be79fa136255..6d088d123591 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c | |||
@@ -38,7 +38,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
38 | .name = "TMU0", | 38 | .name = "TMU0", |
39 | .channel_offset = 0x04, | 39 | .channel_offset = 0x04, |
40 | .timer_bit = 0, | 40 | .timer_bit = 0, |
41 | .clk = "module_clk", | 41 | .clk = "peripheral_clk", |
42 | .clockevent_rating = 200, | 42 | .clockevent_rating = 200, |
43 | }; | 43 | }; |
44 | 44 | ||
@@ -69,7 +69,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
69 | .name = "TMU1", | 69 | .name = "TMU1", |
70 | .channel_offset = 0x10, | 70 | .channel_offset = 0x10, |
71 | .timer_bit = 1, | 71 | .timer_bit = 1, |
72 | .clk = "module_clk", | 72 | .clk = "peripheral_clk", |
73 | .clocksource_rating = 200, | 73 | .clocksource_rating = 200, |
74 | }; | 74 | }; |
75 | 75 | ||
@@ -100,7 +100,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
100 | .name = "TMU2", | 100 | .name = "TMU2", |
101 | .channel_offset = 0x1c, | 101 | .channel_offset = 0x1c, |
102 | .timer_bit = 2, | 102 | .timer_bit = 2, |
103 | .clk = "module_clk", | 103 | .clk = "peripheral_clk", |
104 | }; | 104 | }; |
105 | 105 | ||
106 | static struct resource tmu2_resources[] = { | 106 | static struct resource tmu2_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index 09da0c187d4c..851672d15cf4 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c | |||
@@ -65,7 +65,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
65 | .name = "TMU0", | 65 | .name = "TMU0", |
66 | .channel_offset = 0x04, | 66 | .channel_offset = 0x04, |
67 | .timer_bit = 0, | 67 | .timer_bit = 0, |
68 | .clk = "module_clk", | 68 | .clk = "peripheral_clk", |
69 | .clockevent_rating = 200, | 69 | .clockevent_rating = 200, |
70 | }; | 70 | }; |
71 | 71 | ||
@@ -96,7 +96,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
96 | .name = "TMU1", | 96 | .name = "TMU1", |
97 | .channel_offset = 0x10, | 97 | .channel_offset = 0x10, |
98 | .timer_bit = 1, | 98 | .timer_bit = 1, |
99 | .clk = "module_clk", | 99 | .clk = "peripheral_clk", |
100 | .clocksource_rating = 200, | 100 | .clocksource_rating = 200, |
101 | }; | 101 | }; |
102 | 102 | ||
@@ -127,7 +127,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
127 | .name = "TMU2", | 127 | .name = "TMU2", |
128 | .channel_offset = 0x1c, | 128 | .channel_offset = 0x1c, |
129 | .timer_bit = 2, | 129 | .timer_bit = 2, |
130 | .clk = "module_clk", | 130 | .clk = "peripheral_clk", |
131 | }; | 131 | }; |
132 | 132 | ||
133 | static struct resource tmu2_resources[] = { | 133 | static struct resource tmu2_resources[] = { |
@@ -162,7 +162,7 @@ static struct sh_timer_config tmu3_platform_data = { | |||
162 | .name = "TMU3", | 162 | .name = "TMU3", |
163 | .channel_offset = 0x04, | 163 | .channel_offset = 0x04, |
164 | .timer_bit = 0, | 164 | .timer_bit = 0, |
165 | .clk = "module_clk", | 165 | .clk = "peripheral_clk", |
166 | }; | 166 | }; |
167 | 167 | ||
168 | static struct resource tmu3_resources[] = { | 168 | static struct resource tmu3_resources[] = { |
@@ -192,7 +192,7 @@ static struct sh_timer_config tmu4_platform_data = { | |||
192 | .name = "TMU4", | 192 | .name = "TMU4", |
193 | .channel_offset = 0x10, | 193 | .channel_offset = 0x10, |
194 | .timer_bit = 1, | 194 | .timer_bit = 1, |
195 | .clk = "module_clk", | 195 | .clk = "peripheral_clk", |
196 | }; | 196 | }; |
197 | 197 | ||
198 | static struct resource tmu4_resources[] = { | 198 | static struct resource tmu4_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c index cd097335758f..5b822519bd90 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c | |||
@@ -164,7 +164,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
164 | .name = "TMU0", | 164 | .name = "TMU0", |
165 | .channel_offset = 0x04, | 165 | .channel_offset = 0x04, |
166 | .timer_bit = 0, | 166 | .timer_bit = 0, |
167 | .clk = "module_clk", | 167 | .clk = "peripheral_clk", |
168 | .clockevent_rating = 200, | 168 | .clockevent_rating = 200, |
169 | }; | 169 | }; |
170 | 170 | ||
@@ -195,7 +195,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
195 | .name = "TMU1", | 195 | .name = "TMU1", |
196 | .channel_offset = 0x10, | 196 | .channel_offset = 0x10, |
197 | .timer_bit = 1, | 197 | .timer_bit = 1, |
198 | .clk = "module_clk", | 198 | .clk = "peripheral_clk", |
199 | .clocksource_rating = 200, | 199 | .clocksource_rating = 200, |
200 | }; | 200 | }; |
201 | 201 | ||
@@ -226,7 +226,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
226 | .name = "TMU2", | 226 | .name = "TMU2", |
227 | .channel_offset = 0x1c, | 227 | .channel_offset = 0x1c, |
228 | .timer_bit = 2, | 228 | .timer_bit = 2, |
229 | .clk = "module_clk", | 229 | .clk = "peripheral_clk", |
230 | }; | 230 | }; |
231 | 231 | ||
232 | static struct resource tmu2_resources[] = { | 232 | static struct resource tmu2_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c index c91f34c9aa83..f1e0c0d36da7 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c | |||
@@ -118,7 +118,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
118 | .name = "TMU0", | 118 | .name = "TMU0", |
119 | .channel_offset = 0x04, | 119 | .channel_offset = 0x04, |
120 | .timer_bit = 0, | 120 | .timer_bit = 0, |
121 | .clk = "module_clk", | 121 | .clk = "peripheral_clk", |
122 | .clockevent_rating = 200, | 122 | .clockevent_rating = 200, |
123 | }; | 123 | }; |
124 | 124 | ||
@@ -149,7 +149,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
149 | .name = "TMU1", | 149 | .name = "TMU1", |
150 | .channel_offset = 0x10, | 150 | .channel_offset = 0x10, |
151 | .timer_bit = 1, | 151 | .timer_bit = 1, |
152 | .clk = "module_clk", | 152 | .clk = "peripheral_clk", |
153 | .clocksource_rating = 200, | 153 | .clocksource_rating = 200, |
154 | }; | 154 | }; |
155 | 155 | ||
@@ -180,7 +180,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
180 | .name = "TMU2", | 180 | .name = "TMU2", |
181 | .channel_offset = 0x1c, | 181 | .channel_offset = 0x1c, |
182 | .timer_bit = 2, | 182 | .timer_bit = 2, |
183 | .clk = "module_clk", | 183 | .clk = "peripheral_clk", |
184 | }; | 184 | }; |
185 | 185 | ||
186 | static struct resource tmu2_resources[] = { | 186 | static struct resource tmu2_resources[] = { |
@@ -210,7 +210,7 @@ static struct sh_timer_config tmu3_platform_data = { | |||
210 | .name = "TMU3", | 210 | .name = "TMU3", |
211 | .channel_offset = 0x04, | 211 | .channel_offset = 0x04, |
212 | .timer_bit = 0, | 212 | .timer_bit = 0, |
213 | .clk = "module_clk", | 213 | .clk = "peripheral_clk", |
214 | }; | 214 | }; |
215 | 215 | ||
216 | static struct resource tmu3_resources[] = { | 216 | static struct resource tmu3_resources[] = { |
@@ -240,7 +240,7 @@ static struct sh_timer_config tmu4_platform_data = { | |||
240 | .name = "TMU4", | 240 | .name = "TMU4", |
241 | .channel_offset = 0x10, | 241 | .channel_offset = 0x10, |
242 | .timer_bit = 1, | 242 | .timer_bit = 1, |
243 | .clk = "module_clk", | 243 | .clk = "peripheral_clk", |
244 | }; | 244 | }; |
245 | 245 | ||
246 | static struct resource tmu4_resources[] = { | 246 | static struct resource tmu4_resources[] = { |
@@ -270,7 +270,7 @@ static struct sh_timer_config tmu5_platform_data = { | |||
270 | .name = "TMU5", | 270 | .name = "TMU5", |
271 | .channel_offset = 0x1c, | 271 | .channel_offset = 0x1c, |
272 | .timer_bit = 2, | 272 | .timer_bit = 2, |
273 | .clk = "module_clk", | 273 | .clk = "peripheral_clk", |
274 | }; | 274 | }; |
275 | 275 | ||
276 | static struct resource tmu5_resources[] = { | 276 | static struct resource tmu5_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c index b61d6143aaaa..12fb8752d4ff 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c | |||
@@ -81,7 +81,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
81 | .name = "TMU0", | 81 | .name = "TMU0", |
82 | .channel_offset = 0x04, | 82 | .channel_offset = 0x04, |
83 | .timer_bit = 0, | 83 | .timer_bit = 0, |
84 | .clk = "module_clk", | 84 | .clk = "peripheral_clk", |
85 | .clockevent_rating = 200, | 85 | .clockevent_rating = 200, |
86 | }; | 86 | }; |
87 | 87 | ||
@@ -112,7 +112,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
112 | .name = "TMU1", | 112 | .name = "TMU1", |
113 | .channel_offset = 0x10, | 113 | .channel_offset = 0x10, |
114 | .timer_bit = 1, | 114 | .timer_bit = 1, |
115 | .clk = "module_clk", | 115 | .clk = "peripheral_clk", |
116 | .clocksource_rating = 200, | 116 | .clocksource_rating = 200, |
117 | }; | 117 | }; |
118 | 118 | ||
@@ -143,7 +143,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
143 | .name = "TMU2", | 143 | .name = "TMU2", |
144 | .channel_offset = 0x1c, | 144 | .channel_offset = 0x1c, |
145 | .timer_bit = 2, | 145 | .timer_bit = 2, |
146 | .clk = "module_clk", | 146 | .clk = "peripheral_clk", |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static struct resource tmu2_resources[] = { | 149 | static struct resource tmu2_resources[] = { |
@@ -173,7 +173,7 @@ static struct sh_timer_config tmu3_platform_data = { | |||
173 | .name = "TMU3", | 173 | .name = "TMU3", |
174 | .channel_offset = 0x04, | 174 | .channel_offset = 0x04, |
175 | .timer_bit = 0, | 175 | .timer_bit = 0, |
176 | .clk = "module_clk", | 176 | .clk = "peripheral_clk", |
177 | }; | 177 | }; |
178 | 178 | ||
179 | static struct resource tmu3_resources[] = { | 179 | static struct resource tmu3_resources[] = { |
@@ -203,7 +203,7 @@ static struct sh_timer_config tmu4_platform_data = { | |||
203 | .name = "TMU4", | 203 | .name = "TMU4", |
204 | .channel_offset = 0x10, | 204 | .channel_offset = 0x10, |
205 | .timer_bit = 1, | 205 | .timer_bit = 1, |
206 | .clk = "module_clk", | 206 | .clk = "peripheral_clk", |
207 | }; | 207 | }; |
208 | 208 | ||
209 | static struct resource tmu4_resources[] = { | 209 | static struct resource tmu4_resources[] = { |
@@ -233,7 +233,7 @@ static struct sh_timer_config tmu5_platform_data = { | |||
233 | .name = "TMU5", | 233 | .name = "TMU5", |
234 | .channel_offset = 0x1c, | 234 | .channel_offset = 0x1c, |
235 | .timer_bit = 2, | 235 | .timer_bit = 2, |
236 | .clk = "module_clk", | 236 | .clk = "peripheral_clk", |
237 | }; | 237 | }; |
238 | 238 | ||
239 | static struct resource tmu5_resources[] = { | 239 | static struct resource tmu5_resources[] = { |
@@ -263,7 +263,7 @@ static struct sh_timer_config tmu6_platform_data = { | |||
263 | .name = "TMU6", | 263 | .name = "TMU6", |
264 | .channel_offset = 0x04, | 264 | .channel_offset = 0x04, |
265 | .timer_bit = 0, | 265 | .timer_bit = 0, |
266 | .clk = "module_clk", | 266 | .clk = "peripheral_clk", |
267 | }; | 267 | }; |
268 | 268 | ||
269 | static struct resource tmu6_resources[] = { | 269 | static struct resource tmu6_resources[] = { |
@@ -293,7 +293,7 @@ static struct sh_timer_config tmu7_platform_data = { | |||
293 | .name = "TMU7", | 293 | .name = "TMU7", |
294 | .channel_offset = 0x10, | 294 | .channel_offset = 0x10, |
295 | .timer_bit = 1, | 295 | .timer_bit = 1, |
296 | .clk = "module_clk", | 296 | .clk = "peripheral_clk", |
297 | }; | 297 | }; |
298 | 298 | ||
299 | static struct resource tmu7_resources[] = { | 299 | static struct resource tmu7_resources[] = { |
@@ -323,7 +323,7 @@ static struct sh_timer_config tmu8_platform_data = { | |||
323 | .name = "TMU8", | 323 | .name = "TMU8", |
324 | .channel_offset = 0x1c, | 324 | .channel_offset = 0x1c, |
325 | .timer_bit = 2, | 325 | .timer_bit = 2, |
326 | .clk = "module_clk", | 326 | .clk = "peripheral_clk", |
327 | }; | 327 | }; |
328 | 328 | ||
329 | static struct resource tmu8_resources[] = { | 329 | static struct resource tmu8_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c index f1df02095062..715e05b431e5 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c | |||
@@ -18,7 +18,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
18 | .name = "TMU0", | 18 | .name = "TMU0", |
19 | .channel_offset = 0x04, | 19 | .channel_offset = 0x04, |
20 | .timer_bit = 0, | 20 | .timer_bit = 0, |
21 | .clk = "module_clk", | 21 | .clk = "peripheral_clk", |
22 | .clockevent_rating = 200, | 22 | .clockevent_rating = 200, |
23 | }; | 23 | }; |
24 | 24 | ||
@@ -49,7 +49,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
49 | .name = "TMU1", | 49 | .name = "TMU1", |
50 | .channel_offset = 0x10, | 50 | .channel_offset = 0x10, |
51 | .timer_bit = 1, | 51 | .timer_bit = 1, |
52 | .clk = "module_clk", | 52 | .clk = "peripheral_clk", |
53 | .clocksource_rating = 200, | 53 | .clocksource_rating = 200, |
54 | }; | 54 | }; |
55 | 55 | ||
@@ -80,7 +80,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
80 | .name = "TMU2", | 80 | .name = "TMU2", |
81 | .channel_offset = 0x1c, | 81 | .channel_offset = 0x1c, |
82 | .timer_bit = 2, | 82 | .timer_bit = 2, |
83 | .clk = "module_clk", | 83 | .clk = "peripheral_clk", |
84 | }; | 84 | }; |
85 | 85 | ||
86 | static struct resource tmu2_resources[] = { | 86 | static struct resource tmu2_resources[] = { |
@@ -110,7 +110,7 @@ static struct sh_timer_config tmu3_platform_data = { | |||
110 | .name = "TMU3", | 110 | .name = "TMU3", |
111 | .channel_offset = 0x04, | 111 | .channel_offset = 0x04, |
112 | .timer_bit = 0, | 112 | .timer_bit = 0, |
113 | .clk = "module_clk", | 113 | .clk = "peripheral_clk", |
114 | }; | 114 | }; |
115 | 115 | ||
116 | static struct resource tmu3_resources[] = { | 116 | static struct resource tmu3_resources[] = { |
@@ -140,7 +140,7 @@ static struct sh_timer_config tmu4_platform_data = { | |||
140 | .name = "TMU4", | 140 | .name = "TMU4", |
141 | .channel_offset = 0x10, | 141 | .channel_offset = 0x10, |
142 | .timer_bit = 1, | 142 | .timer_bit = 1, |
143 | .clk = "module_clk", | 143 | .clk = "peripheral_clk", |
144 | }; | 144 | }; |
145 | 145 | ||
146 | static struct resource tmu4_resources[] = { | 146 | static struct resource tmu4_resources[] = { |
@@ -170,7 +170,7 @@ static struct sh_timer_config tmu5_platform_data = { | |||
170 | .name = "TMU5", | 170 | .name = "TMU5", |
171 | .channel_offset = 0x1c, | 171 | .channel_offset = 0x1c, |
172 | .timer_bit = 2, | 172 | .timer_bit = 2, |
173 | .clk = "module_clk", | 173 | .clk = "peripheral_clk", |
174 | }; | 174 | }; |
175 | 175 | ||
176 | static struct resource tmu5_resources[] = { | 176 | static struct resource tmu5_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c index dc5d3e507a21..d7e77bc77e28 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c | |||
@@ -20,7 +20,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
20 | .name = "TMU0", | 20 | .name = "TMU0", |
21 | .channel_offset = 0x04, | 21 | .channel_offset = 0x04, |
22 | .timer_bit = 0, | 22 | .timer_bit = 0, |
23 | .clk = "module_clk", | 23 | .clk = "peripheral_clk", |
24 | .clockevent_rating = 200, | 24 | .clockevent_rating = 200, |
25 | }; | 25 | }; |
26 | 26 | ||
@@ -51,7 +51,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
51 | .name = "TMU1", | 51 | .name = "TMU1", |
52 | .channel_offset = 0x10, | 52 | .channel_offset = 0x10, |
53 | .timer_bit = 1, | 53 | .timer_bit = 1, |
54 | .clk = "module_clk", | 54 | .clk = "peripheral_clk", |
55 | .clocksource_rating = 200, | 55 | .clocksource_rating = 200, |
56 | }; | 56 | }; |
57 | 57 | ||
@@ -82,7 +82,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
82 | .name = "TMU2", | 82 | .name = "TMU2", |
83 | .channel_offset = 0x1c, | 83 | .channel_offset = 0x1c, |
84 | .timer_bit = 2, | 84 | .timer_bit = 2, |
85 | .clk = "module_clk", | 85 | .clk = "peripheral_clk", |
86 | }; | 86 | }; |
87 | 87 | ||
88 | static struct resource tmu2_resources[] = { | 88 | static struct resource tmu2_resources[] = { |
@@ -112,7 +112,7 @@ static struct sh_timer_config tmu3_platform_data = { | |||
112 | .name = "TMU3", | 112 | .name = "TMU3", |
113 | .channel_offset = 0x04, | 113 | .channel_offset = 0x04, |
114 | .timer_bit = 0, | 114 | .timer_bit = 0, |
115 | .clk = "module_clk", | 115 | .clk = "peripheral_clk", |
116 | }; | 116 | }; |
117 | 117 | ||
118 | static struct resource tmu3_resources[] = { | 118 | static struct resource tmu3_resources[] = { |
@@ -142,7 +142,7 @@ static struct sh_timer_config tmu4_platform_data = { | |||
142 | .name = "TMU4", | 142 | .name = "TMU4", |
143 | .channel_offset = 0x10, | 143 | .channel_offset = 0x10, |
144 | .timer_bit = 1, | 144 | .timer_bit = 1, |
145 | .clk = "module_clk", | 145 | .clk = "peripheral_clk", |
146 | }; | 146 | }; |
147 | 147 | ||
148 | static struct resource tmu4_resources[] = { | 148 | static struct resource tmu4_resources[] = { |
@@ -172,7 +172,7 @@ static struct sh_timer_config tmu5_platform_data = { | |||
172 | .name = "TMU5", | 172 | .name = "TMU5", |
173 | .channel_offset = 0x1c, | 173 | .channel_offset = 0x1c, |
174 | .timer_bit = 2, | 174 | .timer_bit = 2, |
175 | .clk = "module_clk", | 175 | .clk = "peripheral_clk", |
176 | }; | 176 | }; |
177 | 177 | ||
178 | static struct resource tmu5_resources[] = { | 178 | static struct resource tmu5_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c index 2c464bf5a899..93e0d2c017e8 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c | |||
@@ -75,7 +75,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
75 | .name = "TMU0", | 75 | .name = "TMU0", |
76 | .channel_offset = 0x04, | 76 | .channel_offset = 0x04, |
77 | .timer_bit = 0, | 77 | .timer_bit = 0, |
78 | .clk = "module_clk", | 78 | .clk = "peripheral_clk", |
79 | .clockevent_rating = 200, | 79 | .clockevent_rating = 200, |
80 | }; | 80 | }; |
81 | 81 | ||
@@ -106,7 +106,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
106 | .name = "TMU1", | 106 | .name = "TMU1", |
107 | .channel_offset = 0x10, | 107 | .channel_offset = 0x10, |
108 | .timer_bit = 1, | 108 | .timer_bit = 1, |
109 | .clk = "module_clk", | 109 | .clk = "peripheral_clk", |
110 | .clocksource_rating = 200, | 110 | .clocksource_rating = 200, |
111 | }; | 111 | }; |
112 | 112 | ||
@@ -137,7 +137,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
137 | .name = "TMU2", | 137 | .name = "TMU2", |
138 | .channel_offset = 0x1c, | 138 | .channel_offset = 0x1c, |
139 | .timer_bit = 2, | 139 | .timer_bit = 2, |
140 | .clk = "module_clk", | 140 | .clk = "peripheral_clk", |
141 | }; | 141 | }; |
142 | 142 | ||
143 | static struct resource tmu2_resources[] = { | 143 | static struct resource tmu2_resources[] = { |
@@ -167,7 +167,7 @@ static struct sh_timer_config tmu3_platform_data = { | |||
167 | .name = "TMU3", | 167 | .name = "TMU3", |
168 | .channel_offset = 0x04, | 168 | .channel_offset = 0x04, |
169 | .timer_bit = 0, | 169 | .timer_bit = 0, |
170 | .clk = "module_clk", | 170 | .clk = "peripheral_clk", |
171 | }; | 171 | }; |
172 | 172 | ||
173 | static struct resource tmu3_resources[] = { | 173 | static struct resource tmu3_resources[] = { |
@@ -197,7 +197,7 @@ static struct sh_timer_config tmu4_platform_data = { | |||
197 | .name = "TMU4", | 197 | .name = "TMU4", |
198 | .channel_offset = 0x10, | 198 | .channel_offset = 0x10, |
199 | .timer_bit = 1, | 199 | .timer_bit = 1, |
200 | .clk = "module_clk", | 200 | .clk = "peripheral_clk", |
201 | }; | 201 | }; |
202 | 202 | ||
203 | static struct resource tmu4_resources[] = { | 203 | static struct resource tmu4_resources[] = { |
@@ -227,7 +227,7 @@ static struct sh_timer_config tmu5_platform_data = { | |||
227 | .name = "TMU5", | 227 | .name = "TMU5", |
228 | .channel_offset = 0x1c, | 228 | .channel_offset = 0x1c, |
229 | .timer_bit = 2, | 229 | .timer_bit = 2, |
230 | .clk = "module_clk", | 230 | .clk = "peripheral_clk", |
231 | }; | 231 | }; |
232 | 232 | ||
233 | static struct resource tmu5_resources[] = { | 233 | static struct resource tmu5_resources[] = { |
@@ -257,7 +257,7 @@ static struct sh_timer_config tmu6_platform_data = { | |||
257 | .name = "TMU6", | 257 | .name = "TMU6", |
258 | .channel_offset = 0x04, | 258 | .channel_offset = 0x04, |
259 | .timer_bit = 0, | 259 | .timer_bit = 0, |
260 | .clk = "module_clk", | 260 | .clk = "peripheral_clk", |
261 | }; | 261 | }; |
262 | 262 | ||
263 | static struct resource tmu6_resources[] = { | 263 | static struct resource tmu6_resources[] = { |
@@ -287,7 +287,7 @@ static struct sh_timer_config tmu7_platform_data = { | |||
287 | .name = "TMU7", | 287 | .name = "TMU7", |
288 | .channel_offset = 0x10, | 288 | .channel_offset = 0x10, |
289 | .timer_bit = 1, | 289 | .timer_bit = 1, |
290 | .clk = "module_clk", | 290 | .clk = "peripheral_clk", |
291 | }; | 291 | }; |
292 | 292 | ||
293 | static struct resource tmu7_resources[] = { | 293 | static struct resource tmu7_resources[] = { |
@@ -317,7 +317,7 @@ static struct sh_timer_config tmu8_platform_data = { | |||
317 | .name = "TMU8", | 317 | .name = "TMU8", |
318 | .channel_offset = 0x1c, | 318 | .channel_offset = 0x1c, |
319 | .timer_bit = 2, | 319 | .timer_bit = 2, |
320 | .clk = "module_clk", | 320 | .clk = "peripheral_clk", |
321 | }; | 321 | }; |
322 | 322 | ||
323 | static struct resource tmu8_resources[] = { | 323 | static struct resource tmu8_resources[] = { |
@@ -347,7 +347,7 @@ static struct sh_timer_config tmu9_platform_data = { | |||
347 | .name = "TMU9", | 347 | .name = "TMU9", |
348 | .channel_offset = 0x04, | 348 | .channel_offset = 0x04, |
349 | .timer_bit = 0, | 349 | .timer_bit = 0, |
350 | .clk = "module_clk", | 350 | .clk = "peripheral_clk", |
351 | }; | 351 | }; |
352 | 352 | ||
353 | static struct resource tmu9_resources[] = { | 353 | static struct resource tmu9_resources[] = { |
@@ -377,7 +377,7 @@ static struct sh_timer_config tmu10_platform_data = { | |||
377 | .name = "TMU10", | 377 | .name = "TMU10", |
378 | .channel_offset = 0x10, | 378 | .channel_offset = 0x10, |
379 | .timer_bit = 1, | 379 | .timer_bit = 1, |
380 | .clk = "module_clk", | 380 | .clk = "peripheral_clk", |
381 | }; | 381 | }; |
382 | 382 | ||
383 | static struct resource tmu10_resources[] = { | 383 | static struct resource tmu10_resources[] = { |
@@ -407,7 +407,7 @@ static struct sh_timer_config tmu11_platform_data = { | |||
407 | .name = "TMU11", | 407 | .name = "TMU11", |
408 | .channel_offset = 0x1c, | 408 | .channel_offset = 0x1c, |
409 | .timer_bit = 2, | 409 | .timer_bit = 2, |
410 | .clk = "module_clk", | 410 | .clk = "peripheral_clk", |
411 | }; | 411 | }; |
412 | 412 | ||
413 | static struct resource tmu11_resources[] = { | 413 | static struct resource tmu11_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c index 9d5185b42f13..53c65fd9ccef 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c +++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c | |||
@@ -53,7 +53,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
53 | .name = "TMU0", | 53 | .name = "TMU0", |
54 | .channel_offset = 0x04, | 54 | .channel_offset = 0x04, |
55 | .timer_bit = 0, | 55 | .timer_bit = 0, |
56 | .clk = "module_clk", | 56 | .clk = "peripheral_clk", |
57 | .clockevent_rating = 200, | 57 | .clockevent_rating = 200, |
58 | }; | 58 | }; |
59 | 59 | ||
@@ -84,7 +84,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
84 | .name = "TMU1", | 84 | .name = "TMU1", |
85 | .channel_offset = 0x10, | 85 | .channel_offset = 0x10, |
86 | .timer_bit = 1, | 86 | .timer_bit = 1, |
87 | .clk = "module_clk", | 87 | .clk = "peripheral_clk", |
88 | .clocksource_rating = 200, | 88 | .clocksource_rating = 200, |
89 | }; | 89 | }; |
90 | 90 | ||
@@ -115,7 +115,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
115 | .name = "TMU2", | 115 | .name = "TMU2", |
116 | .channel_offset = 0x1c, | 116 | .channel_offset = 0x1c, |
117 | .timer_bit = 2, | 117 | .timer_bit = 2, |
118 | .clk = "module_clk", | 118 | .clk = "peripheral_clk", |
119 | }; | 119 | }; |
120 | 120 | ||
121 | static struct resource tmu2_resources[] = { | 121 | static struct resource tmu2_resources[] = { |
@@ -145,7 +145,7 @@ static struct sh_timer_config tmu3_platform_data = { | |||
145 | .name = "TMU3", | 145 | .name = "TMU3", |
146 | .channel_offset = 0x04, | 146 | .channel_offset = 0x04, |
147 | .timer_bit = 0, | 147 | .timer_bit = 0, |
148 | .clk = "module_clk", | 148 | .clk = "peripheral_clk", |
149 | }; | 149 | }; |
150 | 150 | ||
151 | static struct resource tmu3_resources[] = { | 151 | static struct resource tmu3_resources[] = { |
@@ -175,7 +175,7 @@ static struct sh_timer_config tmu4_platform_data = { | |||
175 | .name = "TMU4", | 175 | .name = "TMU4", |
176 | .channel_offset = 0x10, | 176 | .channel_offset = 0x10, |
177 | .timer_bit = 1, | 177 | .timer_bit = 1, |
178 | .clk = "module_clk", | 178 | .clk = "peripheral_clk", |
179 | }; | 179 | }; |
180 | 180 | ||
181 | static struct resource tmu4_resources[] = { | 181 | static struct resource tmu4_resources[] = { |
@@ -205,7 +205,7 @@ static struct sh_timer_config tmu5_platform_data = { | |||
205 | .name = "TMU5", | 205 | .name = "TMU5", |
206 | .channel_offset = 0x1c, | 206 | .channel_offset = 0x1c, |
207 | .timer_bit = 2, | 207 | .timer_bit = 2, |
208 | .clk = "module_clk", | 208 | .clk = "peripheral_clk", |
209 | }; | 209 | }; |
210 | 210 | ||
211 | static struct resource tmu5_resources[] = { | 211 | static struct resource tmu5_resources[] = { |
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c index 678d69bdebba..f5ff1ac57fc2 100644 --- a/arch/sh/kernel/cpu/sh5/setup-sh5.c +++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c | |||
@@ -75,7 +75,7 @@ static struct sh_timer_config tmu0_platform_data = { | |||
75 | .name = "TMU0", | 75 | .name = "TMU0", |
76 | .channel_offset = 0x04, | 76 | .channel_offset = 0x04, |
77 | .timer_bit = 0, | 77 | .timer_bit = 0, |
78 | .clk = "module_clk", | 78 | .clk = "peripheral_clk", |
79 | .clockevent_rating = 200, | 79 | .clockevent_rating = 200, |
80 | }; | 80 | }; |
81 | 81 | ||
@@ -106,7 +106,7 @@ static struct sh_timer_config tmu1_platform_data = { | |||
106 | .name = "TMU1", | 106 | .name = "TMU1", |
107 | .channel_offset = 0x10, | 107 | .channel_offset = 0x10, |
108 | .timer_bit = 1, | 108 | .timer_bit = 1, |
109 | .clk = "module_clk", | 109 | .clk = "peripheral_clk", |
110 | .clocksource_rating = 200, | 110 | .clocksource_rating = 200, |
111 | }; | 111 | }; |
112 | 112 | ||
@@ -137,7 +137,7 @@ static struct sh_timer_config tmu2_platform_data = { | |||
137 | .name = "TMU2", | 137 | .name = "TMU2", |
138 | .channel_offset = 0x1c, | 138 | .channel_offset = 0x1c, |
139 | .timer_bit = 2, | 139 | .timer_bit = 2, |
140 | .clk = "module_clk", | 140 | .clk = "peripheral_clk", |
141 | }; | 141 | }; |
142 | 142 | ||
143 | static struct resource tmu2_resources[] = { | 143 | static struct resource tmu2_resources[] = { |