diff options
author | Magnus Damm <damm@igel.co.jp> | 2009-07-31 03:47:53 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 02:06:01 -0400 |
commit | 09d21f9c83c49afd04850b8701772c09954054e0 (patch) | |
tree | fa0d387b57dd17b696feeae9d622d80005ab5f72 | |
parent | 66d9c51ac434615b0f0e864c0c9a81d7264ca3ef (diff) |
sh: Runtime PM pdev hwblk - sh7723
Add hwblk_id to on-chip sh7723 platform devices.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index 26dc4d323252..4caa5a7ca86e 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <asm/clock.h> | 19 | #include <asm/clock.h> |
20 | #include <asm/mmzone.h> | 20 | #include <asm/mmzone.h> |
21 | #include <cpu/sh7723.h> | ||
21 | 22 | ||
22 | static struct uio_info vpu_platform_data = { | 23 | static struct uio_info vpu_platform_data = { |
23 | .name = "VPU5", | 24 | .name = "VPU5", |
@@ -45,6 +46,9 @@ static struct platform_device vpu_device = { | |||
45 | }, | 46 | }, |
46 | .resource = vpu_resources, | 47 | .resource = vpu_resources, |
47 | .num_resources = ARRAY_SIZE(vpu_resources), | 48 | .num_resources = ARRAY_SIZE(vpu_resources), |
49 | .archdata = { | ||
50 | .hwblk_id = HWBLK_VPU, | ||
51 | }, | ||
48 | }; | 52 | }; |
49 | 53 | ||
50 | static struct uio_info veu0_platform_data = { | 54 | static struct uio_info veu0_platform_data = { |
@@ -73,6 +77,9 @@ static struct platform_device veu0_device = { | |||
73 | }, | 77 | }, |
74 | .resource = veu0_resources, | 78 | .resource = veu0_resources, |
75 | .num_resources = ARRAY_SIZE(veu0_resources), | 79 | .num_resources = ARRAY_SIZE(veu0_resources), |
80 | .archdata = { | ||
81 | .hwblk_id = HWBLK_VEU2H0, | ||
82 | }, | ||
76 | }; | 83 | }; |
77 | 84 | ||
78 | static struct uio_info veu1_platform_data = { | 85 | static struct uio_info veu1_platform_data = { |
@@ -101,6 +108,9 @@ static struct platform_device veu1_device = { | |||
101 | }, | 108 | }, |
102 | .resource = veu1_resources, | 109 | .resource = veu1_resources, |
103 | .num_resources = ARRAY_SIZE(veu1_resources), | 110 | .num_resources = ARRAY_SIZE(veu1_resources), |
111 | .archdata = { | ||
112 | .hwblk_id = HWBLK_VEU2H1, | ||
113 | }, | ||
104 | }; | 114 | }; |
105 | 115 | ||
106 | static struct sh_timer_config cmt_platform_data = { | 116 | static struct sh_timer_config cmt_platform_data = { |
@@ -133,6 +143,9 @@ static struct platform_device cmt_device = { | |||
133 | }, | 143 | }, |
134 | .resource = cmt_resources, | 144 | .resource = cmt_resources, |
135 | .num_resources = ARRAY_SIZE(cmt_resources), | 145 | .num_resources = ARRAY_SIZE(cmt_resources), |
146 | .archdata = { | ||
147 | .hwblk_id = HWBLK_CMT, | ||
148 | }, | ||
136 | }; | 149 | }; |
137 | 150 | ||
138 | static struct sh_timer_config tmu0_platform_data = { | 151 | static struct sh_timer_config tmu0_platform_data = { |
@@ -164,6 +177,9 @@ static struct platform_device tmu0_device = { | |||
164 | }, | 177 | }, |
165 | .resource = tmu0_resources, | 178 | .resource = tmu0_resources, |
166 | .num_resources = ARRAY_SIZE(tmu0_resources), | 179 | .num_resources = ARRAY_SIZE(tmu0_resources), |
180 | .archdata = { | ||
181 | .hwblk_id = HWBLK_TMU0, | ||
182 | }, | ||
167 | }; | 183 | }; |
168 | 184 | ||
169 | static struct sh_timer_config tmu1_platform_data = { | 185 | static struct sh_timer_config tmu1_platform_data = { |
@@ -195,6 +211,9 @@ static struct platform_device tmu1_device = { | |||
195 | }, | 211 | }, |
196 | .resource = tmu1_resources, | 212 | .resource = tmu1_resources, |
197 | .num_resources = ARRAY_SIZE(tmu1_resources), | 213 | .num_resources = ARRAY_SIZE(tmu1_resources), |
214 | .archdata = { | ||
215 | .hwblk_id = HWBLK_TMU0, | ||
216 | }, | ||
198 | }; | 217 | }; |
199 | 218 | ||
200 | static struct sh_timer_config tmu2_platform_data = { | 219 | static struct sh_timer_config tmu2_platform_data = { |
@@ -225,6 +244,9 @@ static struct platform_device tmu2_device = { | |||
225 | }, | 244 | }, |
226 | .resource = tmu2_resources, | 245 | .resource = tmu2_resources, |
227 | .num_resources = ARRAY_SIZE(tmu2_resources), | 246 | .num_resources = ARRAY_SIZE(tmu2_resources), |
247 | .archdata = { | ||
248 | .hwblk_id = HWBLK_TMU0, | ||
249 | }, | ||
228 | }; | 250 | }; |
229 | 251 | ||
230 | static struct sh_timer_config tmu3_platform_data = { | 252 | static struct sh_timer_config tmu3_platform_data = { |
@@ -255,6 +277,9 @@ static struct platform_device tmu3_device = { | |||
255 | }, | 277 | }, |
256 | .resource = tmu3_resources, | 278 | .resource = tmu3_resources, |
257 | .num_resources = ARRAY_SIZE(tmu3_resources), | 279 | .num_resources = ARRAY_SIZE(tmu3_resources), |
280 | .archdata = { | ||
281 | .hwblk_id = HWBLK_TMU1, | ||
282 | }, | ||
258 | }; | 283 | }; |
259 | 284 | ||
260 | static struct sh_timer_config tmu4_platform_data = { | 285 | static struct sh_timer_config tmu4_platform_data = { |
@@ -285,6 +310,9 @@ static struct platform_device tmu4_device = { | |||
285 | }, | 310 | }, |
286 | .resource = tmu4_resources, | 311 | .resource = tmu4_resources, |
287 | .num_resources = ARRAY_SIZE(tmu4_resources), | 312 | .num_resources = ARRAY_SIZE(tmu4_resources), |
313 | .archdata = { | ||
314 | .hwblk_id = HWBLK_TMU1, | ||
315 | }, | ||
288 | }; | 316 | }; |
289 | 317 | ||
290 | static struct sh_timer_config tmu5_platform_data = { | 318 | static struct sh_timer_config tmu5_platform_data = { |
@@ -315,6 +343,9 @@ static struct platform_device tmu5_device = { | |||
315 | }, | 343 | }, |
316 | .resource = tmu5_resources, | 344 | .resource = tmu5_resources, |
317 | .num_resources = ARRAY_SIZE(tmu5_resources), | 345 | .num_resources = ARRAY_SIZE(tmu5_resources), |
346 | .archdata = { | ||
347 | .hwblk_id = HWBLK_TMU1, | ||
348 | }, | ||
318 | }; | 349 | }; |
319 | 350 | ||
320 | static struct plat_sci_port sci_platform_data[] = { | 351 | static struct plat_sci_port sci_platform_data[] = { |
@@ -395,6 +426,9 @@ static struct platform_device rtc_device = { | |||
395 | .id = -1, | 426 | .id = -1, |
396 | .num_resources = ARRAY_SIZE(rtc_resources), | 427 | .num_resources = ARRAY_SIZE(rtc_resources), |
397 | .resource = rtc_resources, | 428 | .resource = rtc_resources, |
429 | .archdata = { | ||
430 | .hwblk_id = HWBLK_RTC, | ||
431 | }, | ||
398 | }; | 432 | }; |
399 | 433 | ||
400 | static struct r8a66597_platdata r8a66597_data = { | 434 | static struct r8a66597_platdata r8a66597_data = { |
@@ -424,6 +458,9 @@ static struct platform_device sh7723_usb_host_device = { | |||
424 | }, | 458 | }, |
425 | .num_resources = ARRAY_SIZE(sh7723_usb_host_resources), | 459 | .num_resources = ARRAY_SIZE(sh7723_usb_host_resources), |
426 | .resource = sh7723_usb_host_resources, | 460 | .resource = sh7723_usb_host_resources, |
461 | .archdata = { | ||
462 | .hwblk_id = HWBLK_USB, | ||
463 | }, | ||
427 | }; | 464 | }; |
428 | 465 | ||
429 | static struct resource iic_resources[] = { | 466 | static struct resource iic_resources[] = { |
@@ -445,6 +482,9 @@ static struct platform_device iic_device = { | |||
445 | .id = 0, /* "i2c0" clock */ | 482 | .id = 0, /* "i2c0" clock */ |
446 | .num_resources = ARRAY_SIZE(iic_resources), | 483 | .num_resources = ARRAY_SIZE(iic_resources), |
447 | .resource = iic_resources, | 484 | .resource = iic_resources, |
485 | .archdata = { | ||
486 | .hwblk_id = HWBLK_IIC, | ||
487 | }, | ||
448 | }; | 488 | }; |
449 | 489 | ||
450 | static struct platform_device *sh7723_devices[] __initdata = { | 490 | static struct platform_device *sh7723_devices[] __initdata = { |