diff options
Diffstat (limited to 'arch/blackfin/mach-bf561/boards/cm_bf561.c')
-rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index 3dc5c042048c..5b2b544529a1 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/spi/spi.h> | 34 | #include <linux/spi/spi.h> |
35 | #include <linux/spi/flash.h> | 35 | #include <linux/spi/flash.h> |
36 | #include <linux/usb_isp1362.h> | 36 | #include <linux/usb_isp1362.h> |
37 | #include <asm/irq.h> | 37 | #include <linux/irq.h> |
38 | #include <asm/bfin5xx_spi.h> | 38 | #include <asm/bfin5xx_spi.h> |
39 | 39 | ||
40 | /* | 40 | /* |
@@ -52,11 +52,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = { | |||
52 | .size = 0x00020000, | 52 | .size = 0x00020000, |
53 | .offset = 0, | 53 | .offset = 0, |
54 | .mask_flags = MTD_CAP_ROM | 54 | .mask_flags = MTD_CAP_ROM |
55 | },{ | 55 | }, { |
56 | .name = "kernel", | 56 | .name = "kernel", |
57 | .size = 0xe0000, | 57 | .size = 0xe0000, |
58 | .offset = 0x20000 | 58 | .offset = 0x20000 |
59 | },{ | 59 | }, { |
60 | .name = "file system", | 60 | .name = "file system", |
61 | .size = 0x700000, | 61 | .size = 0x700000, |
62 | .offset = 0x00100000, | 62 | .offset = 0x00100000, |
@@ -186,7 +186,7 @@ static struct resource smc91x_resources[] = { | |||
186 | .start = 0x28000300, | 186 | .start = 0x28000300, |
187 | .end = 0x28000300 + 16, | 187 | .end = 0x28000300 + 16, |
188 | .flags = IORESOURCE_MEM, | 188 | .flags = IORESOURCE_MEM, |
189 | },{ | 189 | }, { |
190 | .start = IRQ_PF0, | 190 | .start = IRQ_PF0, |
191 | .end = IRQ_PF0, | 191 | .end = IRQ_PF0, |
192 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 192 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
@@ -206,11 +206,11 @@ static struct resource isp1362_hcd_resources[] = { | |||
206 | .start = 0x24008000, | 206 | .start = 0x24008000, |
207 | .end = 0x24008000, | 207 | .end = 0x24008000, |
208 | .flags = IORESOURCE_MEM, | 208 | .flags = IORESOURCE_MEM, |
209 | },{ | 209 | }, { |
210 | .start = 0x24008004, | 210 | .start = 0x24008004, |
211 | .end = 0x24008004, | 211 | .end = 0x24008004, |
212 | .flags = IORESOURCE_MEM, | 212 | .flags = IORESOURCE_MEM, |
213 | },{ | 213 | }, { |
214 | .start = IRQ_PF47, | 214 | .start = IRQ_PF47, |
215 | .end = IRQ_PF47, | 215 | .end = IRQ_PF47, |
216 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 216 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
@@ -241,25 +241,25 @@ static struct platform_device isp1362_hcd_device = { | |||
241 | 241 | ||
242 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 242 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
243 | static struct resource bfin_uart_resources[] = { | 243 | static struct resource bfin_uart_resources[] = { |
244 | { | 244 | { |
245 | .start = 0xFFC00400, | 245 | .start = 0xFFC00400, |
246 | .end = 0xFFC004FF, | 246 | .end = 0xFFC004FF, |
247 | .flags = IORESOURCE_MEM, | 247 | .flags = IORESOURCE_MEM, |
248 | }, | 248 | }, |
249 | }; | 249 | }; |
250 | 250 | ||
251 | static struct platform_device bfin_uart_device = { | 251 | static struct platform_device bfin_uart_device = { |
252 | .name = "bfin-uart", | 252 | .name = "bfin-uart", |
253 | .id = 1, | 253 | .id = 1, |
254 | .num_resources = ARRAY_SIZE(bfin_uart_resources), | 254 | .num_resources = ARRAY_SIZE(bfin_uart_resources), |
255 | .resource = bfin_uart_resources, | 255 | .resource = bfin_uart_resources, |
256 | }; | 256 | }; |
257 | #endif | 257 | #endif |
258 | 258 | ||
259 | static struct platform_device *cm_bf561_devices[] __initdata = { | 259 | static struct platform_device *cm_bf561_devices[] __initdata = { |
260 | 260 | ||
261 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 261 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
262 | &bfin_uart_device, | 262 | &bfin_uart_device, |
263 | #endif | 263 | #endif |
264 | 264 | ||
265 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 265 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |