浏览代码

sh: add platform data for r8a66597-hcd in setup-sh7723

and remove redundant parameter for r8a66597-hcd.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Yoshihiro Shimoda 16 年之前
父节点
当前提交
f73c8f53cc
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      arch/sh/kernel/cpu/sh4a/setup-sh7723.c

+ 7 - 2
arch/sh/kernel/cpu/sh4a/setup-sh7723.c

@@ -13,6 +13,7 @@
 #include <linux/mm.h>
 #include <linux/mm.h>
 #include <linux/serial_sci.h>
 #include <linux/serial_sci.h>
 #include <linux/uio_driver.h>
 #include <linux/uio_driver.h>
+#include <linux/usb/r8a66597.h>
 #include <linux/sh_timer.h>
 #include <linux/sh_timer.h>
 #include <linux/io.h>
 #include <linux/io.h>
 #include <asm/clock.h>
 #include <asm/clock.h>
@@ -396,9 +397,12 @@ static struct platform_device rtc_device = {
 	.resource	= rtc_resources,
 	.resource	= rtc_resources,
 };
 };
 
 
+static struct r8a66597_platdata r8a66597_data = {
+	/* This set zero to all members */
+};
+
 static struct resource sh7723_usb_host_resources[] = {
 static struct resource sh7723_usb_host_resources[] = {
 	[0] = {
 	[0] = {
-		.name	= "r8a66597_hcd",
 		.start	= 0xa4d80000,
 		.start	= 0xa4d80000,
 		.end	= 0xa4d800ff,
 		.end	= 0xa4d800ff,
 		.flags	= IORESOURCE_MEM,
 		.flags	= IORESOURCE_MEM,
@@ -406,7 +410,7 @@ static struct resource sh7723_usb_host_resources[] = {
 	[1] = {
 	[1] = {
 		.start	= 65,
 		.start	= 65,
 		.end	= 65,
 		.end	= 65,
-		.flags	= IORESOURCE_IRQ,
+		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
 	},
 	},
 };
 };
 
 
@@ -416,6 +420,7 @@ static struct platform_device sh7723_usb_host_device = {
 	.dev = {
 	.dev = {
 		.dma_mask		= NULL,         /*  not use dma */
 		.dma_mask		= NULL,         /*  not use dma */
 		.coherent_dma_mask	= 0xffffffff,
 		.coherent_dma_mask	= 0xffffffff,
+		.platform_data		= &r8a66597_data,
 	},
 	},
 	.num_resources	= ARRAY_SIZE(sh7723_usb_host_resources),
 	.num_resources	= ARRAY_SIZE(sh7723_usb_host_resources),
 	.resource	= sh7723_usb_host_resources,
 	.resource	= sh7723_usb_host_resources,