diff options
| author | Magnus Damm <damm@igel.co.jp> | 2009-07-31 03:48:11 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 02:06:09 -0400 |
| commit | 593a0c898ac2f09f001d536f699966ec4bc1d25f (patch) | |
| tree | a6cca158ed00326cac68d2086f967fbdda25f95b | |
| parent | d3a6f6260a3fecd9a8e301fcf37d87ee70edca12 (diff) | |
sh: Runtime PM pdev hwblk - sh7724
Add hwblk_id to on-chip sh7724 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-sh7724.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c index a04edaab9a29..f3851fd757ec 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <asm/clock.h> | 23 | #include <asm/clock.h> |
| 24 | #include <asm/mmzone.h> | 24 | #include <asm/mmzone.h> |
| 25 | #include <cpu/sh7724.h> | ||
| 25 | 26 | ||
| 26 | /* Serial */ | 27 | /* Serial */ |
| 27 | static struct plat_sci_port sci_platform_data[] = { | 28 | static struct plat_sci_port sci_platform_data[] = { |
| @@ -103,6 +104,9 @@ static struct platform_device rtc_device = { | |||
| 103 | .id = -1, | 104 | .id = -1, |
| 104 | .num_resources = ARRAY_SIZE(rtc_resources), | 105 | .num_resources = ARRAY_SIZE(rtc_resources), |
| 105 | .resource = rtc_resources, | 106 | .resource = rtc_resources, |
| 107 | .archdata = { | ||
| 108 | .hwblk_id = HWBLK_RTC, | ||
| 109 | }, | ||
| 106 | }; | 110 | }; |
| 107 | 111 | ||
| 108 | /* I2C0 */ | 112 | /* I2C0 */ |
| @@ -125,6 +129,9 @@ static struct platform_device iic0_device = { | |||
| 125 | .id = 0, /* "i2c0" clock */ | 129 | .id = 0, /* "i2c0" clock */ |
| 126 | .num_resources = ARRAY_SIZE(iic0_resources), | 130 | .num_resources = ARRAY_SIZE(iic0_resources), |
| 127 | .resource = iic0_resources, | 131 | .resource = iic0_resources, |
| 132 | .archdata = { | ||
| 133 | .hwblk_id = HWBLK_IIC0, | ||
| 134 | }, | ||
| 128 | }; | 135 | }; |
| 129 | 136 | ||
| 130 | /* I2C1 */ | 137 | /* I2C1 */ |
| @@ -147,6 +154,9 @@ static struct platform_device iic1_device = { | |||
| 147 | .id = 1, /* "i2c1" clock */ | 154 | .id = 1, /* "i2c1" clock */ |
| 148 | .num_resources = ARRAY_SIZE(iic1_resources), | 155 | .num_resources = ARRAY_SIZE(iic1_resources), |
| 149 | .resource = iic1_resources, | 156 | .resource = iic1_resources, |
| 157 | .archdata = { | ||
| 158 | .hwblk_id = HWBLK_IIC1, | ||
| 159 | }, | ||
| 150 | }; | 160 | }; |
| 151 | 161 | ||
| 152 | /* VPU */ | 162 | /* VPU */ |
| @@ -176,6 +186,9 @@ static struct platform_device vpu_device = { | |||
| 176 | }, | 186 | }, |
| 177 | .resource = vpu_resources, | 187 | .resource = vpu_resources, |
| 178 | .num_resources = ARRAY_SIZE(vpu_resources), | 188 | .num_resources = ARRAY_SIZE(vpu_resources), |
| 189 | .archdata = { | ||
| 190 | .hwblk_id = HWBLK_VPU, | ||
| 191 | }, | ||
| 179 | }; | 192 | }; |
| 180 | 193 | ||
| 181 | /* VEU0 */ | 194 | /* VEU0 */ |
| @@ -205,6 +218,9 @@ static struct platform_device veu0_device = { | |||
| 205 | }, | 218 | }, |
| 206 | .resource = veu0_resources, | 219 | .resource = veu0_resources, |
| 207 | .num_resources = ARRAY_SIZE(veu0_resources), | 220 | .num_resources = ARRAY_SIZE(veu0_resources), |
| 221 | .archdata = { | ||
| 222 | .hwblk_id = HWBLK_VEU0, | ||
| 223 | }, | ||
| 208 | }; | 224 | }; |
| 209 | 225 | ||
| 210 | /* VEU1 */ | 226 | /* VEU1 */ |
| @@ -234,6 +250,9 @@ static struct platform_device veu1_device = { | |||
| 234 | }, | 250 | }, |
| 235 | .resource = veu1_resources, | 251 | .resource = veu1_resources, |
| 236 | .num_resources = ARRAY_SIZE(veu1_resources), | 252 | .num_resources = ARRAY_SIZE(veu1_resources), |
| 253 | .archdata = { | ||
| 254 | .hwblk_id = HWBLK_VEU1, | ||
| 255 | }, | ||
| 237 | }; | 256 | }; |
| 238 | 257 | ||
| 239 | static struct sh_timer_config cmt_platform_data = { | 258 | static struct sh_timer_config cmt_platform_data = { |
| @@ -266,6 +285,9 @@ static struct platform_device cmt_device = { | |||
| 266 | }, | 285 | }, |
| 267 | .resource = cmt_resources, | 286 | .resource = cmt_resources, |
| 268 | .num_resources = ARRAY_SIZE(cmt_resources), | 287 | .num_resources = ARRAY_SIZE(cmt_resources), |
| 288 | .archdata = { | ||
| 289 | .hwblk_id = HWBLK_CMT, | ||
| 290 | }, | ||
| 269 | }; | 291 | }; |
| 270 | 292 | ||
| 271 | static struct sh_timer_config tmu0_platform_data = { | 293 | static struct sh_timer_config tmu0_platform_data = { |
| @@ -297,6 +319,9 @@ static struct platform_device tmu0_device = { | |||
| 297 | }, | 319 | }, |
| 298 | .resource = tmu0_resources, | 320 | .resource = tmu0_resources, |
| 299 | .num_resources = ARRAY_SIZE(tmu0_resources), | 321 | .num_resources = ARRAY_SIZE(tmu0_resources), |
| 322 | .archdata = { | ||
| 323 | .hwblk_id = HWBLK_TMU0, | ||
| 324 | }, | ||
| 300 | }; | 325 | }; |
| 301 | 326 | ||
| 302 | static struct sh_timer_config tmu1_platform_data = { | 327 | static struct sh_timer_config tmu1_platform_data = { |
| @@ -328,6 +353,9 @@ static struct platform_device tmu1_device = { | |||
| 328 | }, | 353 | }, |
| 329 | .resource = tmu1_resources, | 354 | .resource = tmu1_resources, |
| 330 | .num_resources = ARRAY_SIZE(tmu1_resources), | 355 | .num_resources = ARRAY_SIZE(tmu1_resources), |
| 356 | .archdata = { | ||
| 357 | .hwblk_id = HWBLK_TMU0, | ||
| 358 | }, | ||
| 331 | }; | 359 | }; |
| 332 | 360 | ||
| 333 | static struct sh_timer_config tmu2_platform_data = { | 361 | static struct sh_timer_config tmu2_platform_data = { |
| @@ -358,6 +386,9 @@ static struct platform_device tmu2_device = { | |||
| 358 | }, | 386 | }, |
| 359 | .resource = tmu2_resources, | 387 | .resource = tmu2_resources, |
| 360 | .num_resources = ARRAY_SIZE(tmu2_resources), | 388 | .num_resources = ARRAY_SIZE(tmu2_resources), |
| 389 | .archdata = { | ||
| 390 | .hwblk_id = HWBLK_TMU0, | ||
| 391 | }, | ||
| 361 | }; | 392 | }; |
| 362 | 393 | ||
| 363 | 394 | ||
| @@ -389,6 +420,9 @@ static struct platform_device tmu3_device = { | |||
| 389 | }, | 420 | }, |
| 390 | .resource = tmu3_resources, | 421 | .resource = tmu3_resources, |
| 391 | .num_resources = ARRAY_SIZE(tmu3_resources), | 422 | .num_resources = ARRAY_SIZE(tmu3_resources), |
| 423 | .archdata = { | ||
| 424 | .hwblk_id = HWBLK_TMU1, | ||
| 425 | }, | ||
| 392 | }; | 426 | }; |
| 393 | 427 | ||
| 394 | static struct sh_timer_config tmu4_platform_data = { | 428 | static struct sh_timer_config tmu4_platform_data = { |
| @@ -419,6 +453,9 @@ static struct platform_device tmu4_device = { | |||
| 419 | }, | 453 | }, |
| 420 | .resource = tmu4_resources, | 454 | .resource = tmu4_resources, |
| 421 | .num_resources = ARRAY_SIZE(tmu4_resources), | 455 | .num_resources = ARRAY_SIZE(tmu4_resources), |
| 456 | .archdata = { | ||
| 457 | .hwblk_id = HWBLK_TMU1, | ||
| 458 | }, | ||
| 422 | }; | 459 | }; |
| 423 | 460 | ||
| 424 | static struct sh_timer_config tmu5_platform_data = { | 461 | static struct sh_timer_config tmu5_platform_data = { |
| @@ -449,6 +486,9 @@ static struct platform_device tmu5_device = { | |||
| 449 | }, | 486 | }, |
| 450 | .resource = tmu5_resources, | 487 | .resource = tmu5_resources, |
| 451 | .num_resources = ARRAY_SIZE(tmu5_resources), | 488 | .num_resources = ARRAY_SIZE(tmu5_resources), |
| 489 | .archdata = { | ||
| 490 | .hwblk_id = HWBLK_TMU1, | ||
| 491 | }, | ||
| 452 | }; | 492 | }; |
| 453 | 493 | ||
| 454 | /* JPU */ | 494 | /* JPU */ |
| @@ -478,6 +518,9 @@ static struct platform_device jpu_device = { | |||
| 478 | }, | 518 | }, |
| 479 | .resource = jpu_resources, | 519 | .resource = jpu_resources, |
| 480 | .num_resources = ARRAY_SIZE(jpu_resources), | 520 | .num_resources = ARRAY_SIZE(jpu_resources), |
| 521 | .archdata = { | ||
| 522 | .hwblk_id = HWBLK_JPU, | ||
| 523 | }, | ||
| 481 | }; | 524 | }; |
| 482 | 525 | ||
| 483 | static struct platform_device *sh7724_devices[] __initdata = { | 526 | static struct platform_device *sh7724_devices[] __initdata = { |
