diff options
author | Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> | 2009-05-26 05:33:02 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-17 03:19:00 -0400 |
commit | 5a62a22514f97c04b434163195820cbe31ded888 (patch) | |
tree | b1a7476413dbe6e22c491cedda51f25cb44e274b /arch/sh | |
parent | 65795efbd380a832ae508b04dba8f8e53f0b84d9 (diff) |
sh: sh7785lcr: 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/sh')
-rw-r--r-- | arch/sh/boards/board-sh7785lcr.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c index 7be56fb06c1f..42410a15d255 100644 --- a/arch/sh/boards/board-sh7785lcr.c +++ b/arch/sh/boards/board-sh7785lcr.c | |||
@@ -15,16 +15,18 @@ | |||
15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
16 | #include <linux/mtd/physmap.h> | 16 | #include <linux/mtd/physmap.h> |
17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
18 | #include <linux/interrupt.h> | ||
18 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
19 | #include <linux/i2c-pca-platform.h> | 20 | #include <linux/i2c-pca-platform.h> |
20 | #include <linux/i2c-algo-pca.h> | 21 | #include <linux/i2c-algo-pca.h> |
22 | #include <linux/usb/r8a66597.h> | ||
21 | #include <linux/irq.h> | 23 | #include <linux/irq.h> |
22 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
23 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
24 | #include <mach/sh7785lcr.h> | 26 | #include <mach/sh7785lcr.h> |
27 | #include <cpu/sh7785.h> | ||
25 | #include <asm/heartbeat.h> | 28 | #include <asm/heartbeat.h> |
26 | #include <asm/clock.h> | 29 | #include <asm/clock.h> |
27 | #include <cpu/sh7785.h> | ||
28 | 30 | ||
29 | /* | 31 | /* |
30 | * NOTE: This board has 2 physical memory maps. | 32 | * NOTE: This board has 2 physical memory maps. |
@@ -98,18 +100,21 @@ static struct platform_device nor_flash_device = { | |||
98 | .resource = nor_flash_resources, | 100 | .resource = nor_flash_resources, |
99 | }; | 101 | }; |
100 | 102 | ||
103 | static struct r8a66597_platdata r8a66597_data = { | ||
104 | .xtal = R8A66597_PLATDATA_XTAL_12MHZ, | ||
105 | .vif = 1, | ||
106 | }; | ||
107 | |||
101 | static struct resource r8a66597_usb_host_resources[] = { | 108 | static struct resource r8a66597_usb_host_resources[] = { |
102 | [0] = { | 109 | [0] = { |
103 | .name = "r8a66597_hcd", | ||
104 | .start = R8A66597_ADDR, | 110 | .start = R8A66597_ADDR, |
105 | .end = R8A66597_ADDR + R8A66597_SIZE - 1, | 111 | .end = R8A66597_ADDR + R8A66597_SIZE - 1, |
106 | .flags = IORESOURCE_MEM, | 112 | .flags = IORESOURCE_MEM, |
107 | }, | 113 | }, |
108 | [1] = { | 114 | [1] = { |
109 | .name = "r8a66597_hcd", | ||
110 | .start = 2, | 115 | .start = 2, |
111 | .end = 2, | 116 | .end = 2, |
112 | .flags = IORESOURCE_IRQ, | 117 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, |
113 | }, | 118 | }, |
114 | }; | 119 | }; |
115 | 120 | ||
@@ -119,6 +124,7 @@ static struct platform_device r8a66597_usb_host_device = { | |||
119 | .dev = { | 124 | .dev = { |
120 | .dma_mask = NULL, | 125 | .dma_mask = NULL, |
121 | .coherent_dma_mask = 0xffffffff, | 126 | .coherent_dma_mask = 0xffffffff, |
127 | .platform_data = &r8a66597_data, | ||
122 | }, | 128 | }, |
123 | .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources), | 129 | .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources), |
124 | .resource = r8a66597_usb_host_resources, | 130 | .resource = r8a66597_usb_host_resources, |