From: Paul Mundt <lethal@linux-sh.org>
Date: Sun, 23 Aug 2009 09:04:07 +0000 (+0900)
Subject: Merge branches 'sh/hwblk' and 'sh/pm-runtime'
X-Git-Tag: v2.6.32-rc1~640^2~35^2~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3144fc46f987413df10e83659f0bf1aad76f79e;p=pandora-kernel.git

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

c3144fc46f987413df10e83659f0bf1aad76f79e
diff --cc arch/sh/boards/mach-kfr2r09/setup.c
index 1e2cb1976dfb,f9ba43635dc1..7155be0d1154
--- a/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 e6bd09f2e14a,d922e1b71410..1876c8306c85
--- a/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,