diff options
author | Jon Hunter <jon-hunter@ti.com> | 2012-06-05 13:34:53 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-14 05:39:07 -0400 |
commit | 139486fa0c219914cf4a2b41df3e4c525afb1eee (patch) | |
tree | 5f375fd91008392f5081179e54dd69131f960e00 /arch/arm | |
parent | d1c1691be5290bf7e5b11b63b6fda0d63a9f4937 (diff) |
ARM: OMAP2+: HWMOD: Correct timer device attributes
Fix the following issues with the timer device attributes for OMAP2+ devices:
1. For OMAP24xx devices, timers 2-8 have the ALWAYS-ON attribute indicating
that these timers are in an ALWAYS-ON power domain. This is not the case
only timer1 is in an ALWAYS-ON power domain.
2. For OMAP3xxx devices, timers 2-7 have the ALWAYS-ON attribute indicating
that these timers are in an ALWAYS-ON power domain. This is not the case
only timer1 and timer12 are in an ALWAYS-ON power domain.
3. For OMAP3xxx devices, timer12 does not have the ALWAYS-ON attribute but
is in an always-on power domain.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 |
3 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c index 83eafd96ecaa..7814e83fd03f 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | |||
@@ -257,7 +257,6 @@ struct omap_hwmod omap2xxx_timer2_hwmod = { | |||
257 | .idlest_idle_bit = OMAP24XX_ST_GPT2_SHIFT, | 257 | .idlest_idle_bit = OMAP24XX_ST_GPT2_SHIFT, |
258 | }, | 258 | }, |
259 | }, | 259 | }, |
260 | .dev_attr = &capability_alwon_dev_attr, | ||
261 | .class = &omap2xxx_timer_hwmod_class, | 260 | .class = &omap2xxx_timer_hwmod_class, |
262 | }; | 261 | }; |
263 | 262 | ||
@@ -276,7 +275,6 @@ struct omap_hwmod omap2xxx_timer3_hwmod = { | |||
276 | .idlest_idle_bit = OMAP24XX_ST_GPT3_SHIFT, | 275 | .idlest_idle_bit = OMAP24XX_ST_GPT3_SHIFT, |
277 | }, | 276 | }, |
278 | }, | 277 | }, |
279 | .dev_attr = &capability_alwon_dev_attr, | ||
280 | .class = &omap2xxx_timer_hwmod_class, | 278 | .class = &omap2xxx_timer_hwmod_class, |
281 | }; | 279 | }; |
282 | 280 | ||
@@ -295,7 +293,6 @@ struct omap_hwmod omap2xxx_timer4_hwmod = { | |||
295 | .idlest_idle_bit = OMAP24XX_ST_GPT4_SHIFT, | 293 | .idlest_idle_bit = OMAP24XX_ST_GPT4_SHIFT, |
296 | }, | 294 | }, |
297 | }, | 295 | }, |
298 | .dev_attr = &capability_alwon_dev_attr, | ||
299 | .class = &omap2xxx_timer_hwmod_class, | 296 | .class = &omap2xxx_timer_hwmod_class, |
300 | }; | 297 | }; |
301 | 298 | ||
@@ -314,7 +311,6 @@ struct omap_hwmod omap2xxx_timer5_hwmod = { | |||
314 | .idlest_idle_bit = OMAP24XX_ST_GPT5_SHIFT, | 311 | .idlest_idle_bit = OMAP24XX_ST_GPT5_SHIFT, |
315 | }, | 312 | }, |
316 | }, | 313 | }, |
317 | .dev_attr = &capability_alwon_dev_attr, | ||
318 | .class = &omap2xxx_timer_hwmod_class, | 314 | .class = &omap2xxx_timer_hwmod_class, |
319 | }; | 315 | }; |
320 | 316 | ||
@@ -333,7 +329,6 @@ struct omap_hwmod omap2xxx_timer6_hwmod = { | |||
333 | .idlest_idle_bit = OMAP24XX_ST_GPT6_SHIFT, | 329 | .idlest_idle_bit = OMAP24XX_ST_GPT6_SHIFT, |
334 | }, | 330 | }, |
335 | }, | 331 | }, |
336 | .dev_attr = &capability_alwon_dev_attr, | ||
337 | .class = &omap2xxx_timer_hwmod_class, | 332 | .class = &omap2xxx_timer_hwmod_class, |
338 | }; | 333 | }; |
339 | 334 | ||
@@ -352,7 +347,6 @@ struct omap_hwmod omap2xxx_timer7_hwmod = { | |||
352 | .idlest_idle_bit = OMAP24XX_ST_GPT7_SHIFT, | 347 | .idlest_idle_bit = OMAP24XX_ST_GPT7_SHIFT, |
353 | }, | 348 | }, |
354 | }, | 349 | }, |
355 | .dev_attr = &capability_alwon_dev_attr, | ||
356 | .class = &omap2xxx_timer_hwmod_class, | 350 | .class = &omap2xxx_timer_hwmod_class, |
357 | }; | 351 | }; |
358 | 352 | ||
@@ -371,7 +365,6 @@ struct omap_hwmod omap2xxx_timer8_hwmod = { | |||
371 | .idlest_idle_bit = OMAP24XX_ST_GPT8_SHIFT, | 365 | .idlest_idle_bit = OMAP24XX_ST_GPT8_SHIFT, |
372 | }, | 366 | }, |
373 | }, | 367 | }, |
374 | .dev_attr = &capability_alwon_dev_attr, | ||
375 | .class = &omap2xxx_timer_hwmod_class, | 368 | .class = &omap2xxx_timer_hwmod_class, |
376 | }; | 369 | }; |
377 | 370 | ||
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index b26d3c9bca16..7b330944b3f7 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
@@ -150,7 +150,7 @@ static struct omap_hwmod_class omap3xxx_timer_hwmod_class = { | |||
150 | 150 | ||
151 | /* secure timers dev attribute */ | 151 | /* secure timers dev attribute */ |
152 | static struct omap_timer_capability_dev_attr capability_secure_dev_attr = { | 152 | static struct omap_timer_capability_dev_attr capability_secure_dev_attr = { |
153 | .timer_capability = OMAP_TIMER_SECURE, | 153 | .timer_capability = OMAP_TIMER_ALWON | OMAP_TIMER_SECURE, |
154 | }; | 154 | }; |
155 | 155 | ||
156 | /* always-on timers dev attribute */ | 156 | /* always-on timers dev attribute */ |
@@ -195,7 +195,6 @@ static struct omap_hwmod omap3xxx_timer2_hwmod = { | |||
195 | .idlest_idle_bit = OMAP3430_ST_GPT2_SHIFT, | 195 | .idlest_idle_bit = OMAP3430_ST_GPT2_SHIFT, |
196 | }, | 196 | }, |
197 | }, | 197 | }, |
198 | .dev_attr = &capability_alwon_dev_attr, | ||
199 | .class = &omap3xxx_timer_1ms_hwmod_class, | 198 | .class = &omap3xxx_timer_1ms_hwmod_class, |
200 | }; | 199 | }; |
201 | 200 | ||
@@ -213,7 +212,6 @@ static struct omap_hwmod omap3xxx_timer3_hwmod = { | |||
213 | .idlest_idle_bit = OMAP3430_ST_GPT3_SHIFT, | 212 | .idlest_idle_bit = OMAP3430_ST_GPT3_SHIFT, |
214 | }, | 213 | }, |
215 | }, | 214 | }, |
216 | .dev_attr = &capability_alwon_dev_attr, | ||
217 | .class = &omap3xxx_timer_hwmod_class, | 215 | .class = &omap3xxx_timer_hwmod_class, |
218 | }; | 216 | }; |
219 | 217 | ||
@@ -231,7 +229,6 @@ static struct omap_hwmod omap3xxx_timer4_hwmod = { | |||
231 | .idlest_idle_bit = OMAP3430_ST_GPT4_SHIFT, | 229 | .idlest_idle_bit = OMAP3430_ST_GPT4_SHIFT, |
232 | }, | 230 | }, |
233 | }, | 231 | }, |
234 | .dev_attr = &capability_alwon_dev_attr, | ||
235 | .class = &omap3xxx_timer_hwmod_class, | 232 | .class = &omap3xxx_timer_hwmod_class, |
236 | }; | 233 | }; |
237 | 234 | ||
@@ -249,7 +246,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = { | |||
249 | .idlest_idle_bit = OMAP3430_ST_GPT5_SHIFT, | 246 | .idlest_idle_bit = OMAP3430_ST_GPT5_SHIFT, |
250 | }, | 247 | }, |
251 | }, | 248 | }, |
252 | .dev_attr = &capability_alwon_dev_attr, | ||
253 | .class = &omap3xxx_timer_hwmod_class, | 249 | .class = &omap3xxx_timer_hwmod_class, |
254 | }; | 250 | }; |
255 | 251 | ||
@@ -267,7 +263,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = { | |||
267 | .idlest_idle_bit = OMAP3430_ST_GPT6_SHIFT, | 263 | .idlest_idle_bit = OMAP3430_ST_GPT6_SHIFT, |
268 | }, | 264 | }, |
269 | }, | 265 | }, |
270 | .dev_attr = &capability_alwon_dev_attr, | ||
271 | .class = &omap3xxx_timer_hwmod_class, | 266 | .class = &omap3xxx_timer_hwmod_class, |
272 | }; | 267 | }; |
273 | 268 | ||
@@ -285,7 +280,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = { | |||
285 | .idlest_idle_bit = OMAP3430_ST_GPT7_SHIFT, | 280 | .idlest_idle_bit = OMAP3430_ST_GPT7_SHIFT, |
286 | }, | 281 | }, |
287 | }, | 282 | }, |
288 | .dev_attr = &capability_alwon_dev_attr, | ||
289 | .class = &omap3xxx_timer_hwmod_class, | 283 | .class = &omap3xxx_timer_hwmod_class, |
290 | }; | 284 | }; |
291 | 285 | ||
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 950454a3fa31..ebf9657460dd 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |||
@@ -2943,7 +2943,6 @@ static struct omap_hwmod omap44xx_timer2_hwmod = { | |||
2943 | .modulemode = MODULEMODE_SWCTRL, | 2943 | .modulemode = MODULEMODE_SWCTRL, |
2944 | }, | 2944 | }, |
2945 | }, | 2945 | }, |
2946 | .dev_attr = &capability_alwon_dev_attr, | ||
2947 | }; | 2946 | }; |
2948 | 2947 | ||
2949 | /* timer3 */ | 2948 | /* timer3 */ |
@@ -2965,7 +2964,6 @@ static struct omap_hwmod omap44xx_timer3_hwmod = { | |||
2965 | .modulemode = MODULEMODE_SWCTRL, | 2964 | .modulemode = MODULEMODE_SWCTRL, |
2966 | }, | 2965 | }, |
2967 | }, | 2966 | }, |
2968 | .dev_attr = &capability_alwon_dev_attr, | ||
2969 | }; | 2967 | }; |
2970 | 2968 | ||
2971 | /* timer4 */ | 2969 | /* timer4 */ |
@@ -2987,7 +2985,6 @@ static struct omap_hwmod omap44xx_timer4_hwmod = { | |||
2987 | .modulemode = MODULEMODE_SWCTRL, | 2985 | .modulemode = MODULEMODE_SWCTRL, |
2988 | }, | 2986 | }, |
2989 | }, | 2987 | }, |
2990 | .dev_attr = &capability_alwon_dev_attr, | ||
2991 | }; | 2988 | }; |
2992 | 2989 | ||
2993 | /* timer5 */ | 2990 | /* timer5 */ |
@@ -3009,7 +3006,6 @@ static struct omap_hwmod omap44xx_timer5_hwmod = { | |||
3009 | .modulemode = MODULEMODE_SWCTRL, | 3006 | .modulemode = MODULEMODE_SWCTRL, |
3010 | }, | 3007 | }, |
3011 | }, | 3008 | }, |
3012 | .dev_attr = &capability_alwon_dev_attr, | ||
3013 | }; | 3009 | }; |
3014 | 3010 | ||
3015 | /* timer6 */ | 3011 | /* timer6 */ |
@@ -3032,7 +3028,6 @@ static struct omap_hwmod omap44xx_timer6_hwmod = { | |||
3032 | .modulemode = MODULEMODE_SWCTRL, | 3028 | .modulemode = MODULEMODE_SWCTRL, |
3033 | }, | 3029 | }, |
3034 | }, | 3030 | }, |
3035 | .dev_attr = &capability_alwon_dev_attr, | ||
3036 | }; | 3031 | }; |
3037 | 3032 | ||
3038 | /* timer7 */ | 3033 | /* timer7 */ |
@@ -3054,7 +3049,6 @@ static struct omap_hwmod omap44xx_timer7_hwmod = { | |||
3054 | .modulemode = MODULEMODE_SWCTRL, | 3049 | .modulemode = MODULEMODE_SWCTRL, |
3055 | }, | 3050 | }, |
3056 | }, | 3051 | }, |
3057 | .dev_attr = &capability_alwon_dev_attr, | ||
3058 | }; | 3052 | }; |
3059 | 3053 | ||
3060 | /* timer8 */ | 3054 | /* timer8 */ |