Merge branches 'sh/hwblk' and 'sh/pm-runtime'

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sh/boards/mach-kfr2r09/setup.c
index 1e2cb1976dfb7ce739e382c4c264b5459db81199,f9ba43635dc1eb14af700819b0c8f2a5b975177d..7155be0d115425ff9c621623c3230fb7e4b834ad
--- 1/arch/sh/boards/mach-kfr2r09/setup.c
--- 2/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@@ -175,37 -176,11 +178,40 @@@ static struct platform_device kfr2r09_s
        .dev    = {
                .platform_data  = &kfr2r09_sh_lcdc_info,
        },
+       .archdata = {
+               .hwblk_id = HWBLK_LCDC,
+       },
  };
  
 +static struct r8a66597_platdata kfr2r09_usb0_gadget_data = {
 +      .on_chip = 1,
 +};
 +
 +static struct resource kfr2r09_usb0_gadget_resources[] = {
 +      [0] = {
 +              .start  = 0x04d80000,
 +              .end    = 0x04d80123,
 +              .flags  = IORESOURCE_MEM,
 +      },
 +      [1] = {
 +              .start  = 65,
 +              .end    = 65,
 +              .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
 +      },
 +};
 +
 +static struct platform_device kfr2r09_usb0_gadget_device = {
 +      .name           = "r8a66597_udc",
 +      .id             = 0,
 +      .dev = {
 +              .dma_mask               = NULL,         /*  not use dma */
 +              .coherent_dma_mask      = 0xffffffff,
 +              .platform_data  = &kfr2r09_usb0_gadget_data,
 +      },
 +      .num_resources  = ARRAY_SIZE(kfr2r09_usb0_gadget_resources),
 +      .resource       = kfr2r09_usb0_gadget_resources,
 +};
 +
  static struct platform_device *kfr2r09_devices[] __initdata = {
        &kfr2r09_nor_flash_device,
        &kfr2r09_nand_flash_device,

diff --cc arch/sh/boards/mach-se/7724/setup.c
index e6bd09f2e14ad9bd79dc838f2e2f8c79e5fef363,d922e1b7141087f7eca6457f852f4093872cddf0..1876c8306c85e3d5cb5a73a8279e4371ce391839
--- 1/arch/sh/boards/mach-se/7724/setup.c
--- 2/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@@ -339,37 -354,11 +354,40 @@@ static struct platform_device sh7724_us
        },
        .num_resources  = ARRAY_SIZE(sh7724_usb0_host_resources),
        .resource       = sh7724_usb0_host_resources,
+       .archdata = {
+               .hwblk_id = HWBLK_USB0,
+       },
  };
  
 +static struct r8a66597_platdata sh7724_usb1_gadget_data = {
 +      .on_chip = 1,
 +};
 +
 +static struct resource sh7724_usb1_gadget_resources[] = {
 +      [0] = {
 +              .start  = 0xa4d90000,
 +              .end    = 0xa4d90123,
 +              .flags  = IORESOURCE_MEM,
 +      },
 +      [1] = {
 +              .start  = 66,
 +              .end    = 66,
 +              .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
 +      },
 +};
 +
 +static struct platform_device sh7724_usb1_gadget_device = {
 +      .name           = "r8a66597_udc",
 +      .id             = 1, /* USB1 */
 +      .dev = {
 +              .dma_mask               = NULL,         /*  not use dma */
 +              .coherent_dma_mask      = 0xffffffff,
 +              .platform_data          = &sh7724_usb1_gadget_data,
 +      },
 +      .num_resources  = ARRAY_SIZE(sh7724_usb1_gadget_resources),
 +      .resource       = sh7724_usb1_gadget_resources,
 +};
 +
  static struct platform_device *ms7724se_devices[] __initdata = {
        &heartbeat_device,
        &smc91x_eth_device,

diff --cc arch/sh/kernel/cpu/sh4a/clock-sh7724.c
Simple merge