Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits)
  sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn
  sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
  sh: remove stray markers.
  sh: defconfig updates.
  sh: pci: Initial PCI-Express support for SH7786 Urquell board.
  sh: Generic HAVE_PERF_COUNTER support.
  SH: convert migor to soc-camera as platform-device
  SH: convert ap325rxa to soc-camera as platform-device
  soc-camera: unify i2c camera device platform data
  sh: add platform data for r8a66597-hcd in setup-sh7723
  sh: add platform data for r8a66597-hcd in setup-sh7366
  sh: x3proto: add platform data for r8a66597-hcd
  sh: highlander: add platform data for r8a66597-hcd
  sh: sh7785lcr: add platform data for r8a66597-hcd
  sh: turn off irqs when disabling CMT/TMU timers
  sh: use kzalloc() for cpg clocks
  sh: unbreak WARN_ON()
  sh: Use generic atomic64_t implementation.
  sh: Revised clock function in highlander
  sh: Update r7780mp defconfig
  ...

1 files changed, 9 insertions, 3 deletions

diff --git a/arch/sh/boards/mach-x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c
index a340492087fa..8913ae39a802 100644
--- a/arch/sh/boards/mach-x3proto/setup.c
+++ b/arch/sh/boards/mach-x3proto/setup.c
@@ -15,6 +15,8 @@
 #include <linux/io.h>
 #include <linux/smc91x.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/usb/r8a66597.h>
 #include <asm/ilsel.h>
 
 static struct resource heartbeat_resources[] = {
@@ -58,17 +60,20 @@ static struct platform_device smc91x_device = {
         },
 };
 
+static struct r8a66597_platdata r8a66597_data = {
+        .xtal = R8A66597_PLATDATA_XTAL_12MHZ,
+        .vif = 1,
+};
+
 static struct resource r8a66597_usb_host_resources[] = {
         [0] = {
-                .name   = "r8a66597_hcd",
                 .start  = 0x18040000,
                 .end    = 0x18080000 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .name   = "r8a66597_hcd",
                 /* Filled in by ilsel */
-                .flags  = IORESOURCE_IRQ,
+                .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
         },
 };
 
@@ -78,6 +83,7 @@ static struct platform_device r8a66597_usb_host_device = {
         .dev = {
                 .dma_mask               = NULL,         /* don't use dma */
                 .coherent_dma_mask      = 0xffffffff,
+                .platform_data          = &r8a66597_data,
         },
         .num_resources  = ARRAY_SIZE(r8a66597_usb_host_resources),
         .resource       = r8a66597_usb_host_resources,