diff options
author | Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> | 2009-05-26 05:33:08 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-17 03:19:43 -0400 |
commit | fcaf99d20d86995cfa1a4f01b1273f9f7d74717e (patch) | |
tree | 148d5beae7b3c9f67fbe781f62f40bb28e80df1d /arch | |
parent | 6239b20d1ba60810c122390e79f968ccb69908a6 (diff) |
sh: x3proto: add platform data for r8a66597-hcd
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/boards/mach-x3proto/setup.c | 12 |
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 a340492087f..8913ae39a80 100644 --- a/arch/sh/boards/mach-x3proto/setup.c +++ b/arch/sh/boards/mach-x3proto/setup.c | |||
@@ -15,6 +15,8 @@ | |||
15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
16 | #include <linux/smc91x.h> | 16 | #include <linux/smc91x.h> |
17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
18 | #include <linux/interrupt.h> | ||
19 | #include <linux/usb/r8a66597.h> | ||
18 | #include <asm/ilsel.h> | 20 | #include <asm/ilsel.h> |
19 | 21 | ||
20 | static struct resource heartbeat_resources[] = { | 22 | static struct resource heartbeat_resources[] = { |
@@ -58,17 +60,20 @@ static struct platform_device smc91x_device = { | |||
58 | }, | 60 | }, |
59 | }; | 61 | }; |
60 | 62 | ||
63 | static struct r8a66597_platdata r8a66597_data = { | ||
64 | .xtal = R8A66597_PLATDATA_XTAL_12MHZ, | ||
65 | .vif = 1, | ||
66 | }; | ||
67 | |||
61 | static struct resource r8a66597_usb_host_resources[] = { | 68 | static struct resource r8a66597_usb_host_resources[] = { |
62 | [0] = { | 69 | [0] = { |
63 | .name = "r8a66597_hcd", | ||
64 | .start = 0x18040000, | 70 | .start = 0x18040000, |
65 | .end = 0x18080000 - 1, | 71 | .end = 0x18080000 - 1, |
66 | .flags = IORESOURCE_MEM, | 72 | .flags = IORESOURCE_MEM, |
67 | }, | 73 | }, |
68 | [1] = { | 74 | [1] = { |
69 | .name = "r8a66597_hcd", | ||
70 | /* Filled in by ilsel */ | 75 | /* Filled in by ilsel */ |
71 | .flags = IORESOURCE_IRQ, | 76 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, |
72 | }, | 77 | }, |
73 | }; | 78 | }; |
74 | 79 | ||
@@ -78,6 +83,7 @@ static struct platform_device r8a66597_usb_host_device = { | |||
78 | .dev = { | 83 | .dev = { |
79 | .dma_mask = NULL, /* don't use dma */ | 84 | .dma_mask = NULL, /* don't use dma */ |
80 | .coherent_dma_mask = 0xffffffff, | 85 | .coherent_dma_mask = 0xffffffff, |
86 | .platform_data = &r8a66597_data, | ||
81 | }, | 87 | }, |
82 | .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources), | 88 | .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources), |
83 | .resource = r8a66597_usb_host_resources, | 89 | .resource = r8a66597_usb_host_resources, |