diff options
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/generic_board.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/generic_board.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index fd57e7439e0f..648d984e98d6 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
@@ -35,9 +35,9 @@ | |||
35 | #include <linux/spi/spi.h> | 35 | #include <linux/spi/spi.h> |
36 | #include <linux/spi/flash.h> | 36 | #include <linux/spi/flash.h> |
37 | #include <linux/usb_isp1362.h> | 37 | #include <linux/usb_isp1362.h> |
38 | #include <asm/irq.h> | 38 | #include <linux/irq.h> |
39 | #include <asm/bfin5xx_spi.h> | ||
40 | #include <linux/usb_sl811.h> | 39 | #include <linux/usb_sl811.h> |
40 | #include <asm/bfin5xx_spi.h> | ||
41 | 41 | ||
42 | /* | 42 | /* |
43 | * Name the Board for the /proc/cpuinfo | 43 | * Name the Board for the /proc/cpuinfo |
@@ -54,19 +54,19 @@ static struct resource bfin_pcmcia_cf_resources[] = { | |||
54 | .start = 0x20310000, /* IO PORT */ | 54 | .start = 0x20310000, /* IO PORT */ |
55 | .end = 0x20312000, | 55 | .end = 0x20312000, |
56 | .flags = IORESOURCE_MEM, | 56 | .flags = IORESOURCE_MEM, |
57 | },{ | 57 | }, { |
58 | .start = 0x20311000, /* Attribute Memory */ | 58 | .start = 0x20311000, /* Attribute Memory */ |
59 | .end = 0x20311FFF, | 59 | .end = 0x20311FFF, |
60 | .flags = IORESOURCE_MEM, | 60 | .flags = IORESOURCE_MEM, |
61 | },{ | 61 | }, { |
62 | .start = IRQ_PROG_INTA, | 62 | .start = IRQ_PROG_INTA, |
63 | .end = IRQ_PROG_INTA, | 63 | .end = IRQ_PROG_INTA, |
64 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | 64 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, |
65 | },{ | 65 | }, { |
66 | .start = IRQ_PF4, | 66 | .start = IRQ_PF4, |
67 | .end = IRQ_PF4, | 67 | .end = IRQ_PF4, |
68 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | 68 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, |
69 | },{ | 69 | }, { |
70 | .start = 6, /* Card Detect PF6 */ | 70 | .start = 6, /* Card Detect PF6 */ |
71 | .end = 6, | 71 | .end = 6, |
72 | .flags = IORESOURCE_IRQ, | 72 | .flags = IORESOURCE_IRQ, |
@@ -95,11 +95,11 @@ static struct resource smc91x_resources[] = { | |||
95 | .start = 0x20300300, | 95 | .start = 0x20300300, |
96 | .end = 0x20300300 + 16, | 96 | .end = 0x20300300 + 16, |
97 | .flags = IORESOURCE_MEM, | 97 | .flags = IORESOURCE_MEM, |
98 | },{ | 98 | }, { |
99 | .start = IRQ_PROG_INTB, | 99 | .start = IRQ_PROG_INTB, |
100 | .end = IRQ_PROG_INTB, | 100 | .end = IRQ_PROG_INTB, |
101 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 101 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
102 | },{ | 102 | }, { |
103 | /* | 103 | /* |
104 | * denotes the flag pin and is used directly if | 104 | * denotes the flag pin and is used directly if |
105 | * CONFIG_IRQCHIP_DEMUX_GPIO is defined. | 105 | * CONFIG_IRQCHIP_DEMUX_GPIO is defined. |
@@ -123,15 +123,15 @@ static struct resource sl811_hcd_resources[] = { | |||
123 | .start = 0x20340000, | 123 | .start = 0x20340000, |
124 | .end = 0x20340000, | 124 | .end = 0x20340000, |
125 | .flags = IORESOURCE_MEM, | 125 | .flags = IORESOURCE_MEM, |
126 | },{ | 126 | }, { |
127 | .start = 0x20340004, | 127 | .start = 0x20340004, |
128 | .end = 0x20340004, | 128 | .end = 0x20340004, |
129 | .flags = IORESOURCE_MEM, | 129 | .flags = IORESOURCE_MEM, |
130 | },{ | 130 | }, { |
131 | .start = IRQ_PROG_INTA, | 131 | .start = IRQ_PROG_INTA, |
132 | .end = IRQ_PROG_INTA, | 132 | .end = IRQ_PROG_INTA, |
133 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 133 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
134 | },{ | 134 | }, { |
135 | .start = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO, | 135 | .start = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO, |
136 | .end = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO, | 136 | .end = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO, |
137 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 137 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
@@ -179,15 +179,15 @@ static struct resource isp1362_hcd_resources[] = { | |||
179 | .start = 0x20360000, | 179 | .start = 0x20360000, |
180 | .end = 0x20360000, | 180 | .end = 0x20360000, |
181 | .flags = IORESOURCE_MEM, | 181 | .flags = IORESOURCE_MEM, |
182 | },{ | 182 | }, { |
183 | .start = 0x20360004, | 183 | .start = 0x20360004, |
184 | .end = 0x20360004, | 184 | .end = 0x20360004, |
185 | .flags = IORESOURCE_MEM, | 185 | .flags = IORESOURCE_MEM, |
186 | },{ | 186 | }, { |
187 | .start = IRQ_PROG_INTA, | 187 | .start = IRQ_PROG_INTA, |
188 | .end = IRQ_PROG_INTA, | 188 | .end = IRQ_PROG_INTA, |
189 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 189 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
190 | },{ | 190 | }, { |
191 | .start = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO, | 191 | .start = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO, |
192 | .end = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO, | 192 | .end = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO, |
193 | .flags = IORESOURCE_IRQ, | 193 | .flags = IORESOURCE_IRQ, |
@@ -228,7 +228,7 @@ static struct resource net2272_bfin_resources[] = { | |||
228 | .start = 0x20300000, | 228 | .start = 0x20300000, |
229 | .end = 0x20300000 + 0x100, | 229 | .end = 0x20300000 + 0x100, |
230 | .flags = IORESOURCE_MEM, | 230 | .flags = IORESOURCE_MEM, |
231 | },{ | 231 | }, { |
232 | .start = IRQ_PF7, | 232 | .start = IRQ_PF7, |
233 | .end = IRQ_PF7, | 233 | .end = IRQ_PF7, |
234 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 234 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
@@ -253,11 +253,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = { | |||
253 | .size = 0x00020000, | 253 | .size = 0x00020000, |
254 | .offset = 0, | 254 | .offset = 0, |
255 | .mask_flags = MTD_CAP_ROM | 255 | .mask_flags = MTD_CAP_ROM |
256 | },{ | 256 | }, { |
257 | .name = "kernel", | 257 | .name = "kernel", |
258 | .size = 0xe0000, | 258 | .size = 0xe0000, |
259 | .offset = 0x20000 | 259 | .offset = 0x20000 |
260 | },{ | 260 | }, { |
261 | .name = "file system", | 261 | .name = "file system", |
262 | .size = 0x700000, | 262 | .size = 0x700000, |
263 | .offset = 0x00100000, | 263 | .offset = 0x00100000, |
@@ -375,7 +375,7 @@ static struct resource bfin_uart_resources[] = { | |||
375 | .start = 0xFFC00400, | 375 | .start = 0xFFC00400, |
376 | .end = 0xFFC004FF, | 376 | .end = 0xFFC004FF, |
377 | .flags = IORESOURCE_MEM, | 377 | .flags = IORESOURCE_MEM, |
378 | },{ | 378 | }, { |
379 | .start = 0xFFC02000, | 379 | .start = 0xFFC02000, |
380 | .end = 0xFFC020FF, | 380 | .end = 0xFFC020FF, |
381 | .flags = IORESOURCE_MEM, | 381 | .flags = IORESOURCE_MEM, |