diff options
Diffstat (limited to 'arch/blackfin/mach-bf561')
-rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 47 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/ezkit.c | 47 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/tepla.c | 53 |
3 files changed, 131 insertions, 16 deletions
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index dfc8d5b77986..818266f6348f 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
@@ -305,21 +305,50 @@ static struct platform_device isp1362_hcd_device = { | |||
305 | #endif | 305 | #endif |
306 | 306 | ||
307 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 307 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
308 | static struct resource bfin_uart_resources[] = { | 308 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
309 | static struct resource bfin_uart0_resources[] = { | ||
309 | { | 310 | { |
310 | .start = 0xFFC00400, | 311 | .start = BFIN_UART_THR, |
311 | .end = 0xFFC004FF, | 312 | .end = BFIN_UART_GCTL+2, |
312 | .flags = IORESOURCE_MEM, | 313 | .flags = IORESOURCE_MEM, |
313 | }, | 314 | }, |
315 | { | ||
316 | .start = IRQ_UART_RX, | ||
317 | .end = IRQ_UART_RX+1, | ||
318 | .flags = IORESOURCE_IRQ, | ||
319 | }, | ||
320 | { | ||
321 | .start = IRQ_UART_ERROR, | ||
322 | .end = IRQ_UART_ERROR, | ||
323 | .flags = IORESOURCE_IRQ, | ||
324 | }, | ||
325 | { | ||
326 | .start = CH_UART_TX, | ||
327 | .end = CH_UART_TX, | ||
328 | .flags = IORESOURCE_DMA, | ||
329 | }, | ||
330 | { | ||
331 | .start = CH_UART_RX, | ||
332 | .end = CH_UART_RX, | ||
333 | .flags = IORESOURCE_DMA, | ||
334 | }, | ||
335 | }; | ||
336 | |||
337 | unsigned short bfin_uart0_peripherals[] = { | ||
338 | P_UART0_TX, P_UART0_RX, 0 | ||
314 | }; | 339 | }; |
315 | 340 | ||
316 | static struct platform_device bfin_uart_device = { | 341 | static struct platform_device bfin_uart0_device = { |
317 | .name = "bfin-uart", | 342 | .name = "bfin-uart", |
318 | .id = 1, | 343 | .id = 0, |
319 | .num_resources = ARRAY_SIZE(bfin_uart_resources), | 344 | .num_resources = ARRAY_SIZE(bfin_uart0_resources), |
320 | .resource = bfin_uart_resources, | 345 | .resource = bfin_uart0_resources, |
346 | .dev = { | ||
347 | .platform_data = &bfin_uart0_peripherals, /* Passed to driver */ | ||
348 | }, | ||
321 | }; | 349 | }; |
322 | #endif | 350 | #endif |
351 | #endif | ||
323 | 352 | ||
324 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 353 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
325 | #ifdef CONFIG_BFIN_SIR0 | 354 | #ifdef CONFIG_BFIN_SIR0 |
@@ -463,7 +492,9 @@ static struct platform_device *cm_bf561_devices[] __initdata = { | |||
463 | #endif | 492 | #endif |
464 | 493 | ||
465 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 494 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
466 | &bfin_uart_device, | 495 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
496 | &bfin_uart0_device, | ||
497 | #endif | ||
467 | #endif | 498 | #endif |
468 | 499 | ||
469 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 500 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index ffd3e6a80d1a..c59041c513e0 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -160,21 +160,50 @@ static struct platform_device smc91x_device = { | |||
160 | #endif | 160 | #endif |
161 | 161 | ||
162 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 162 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
163 | static struct resource bfin_uart_resources[] = { | 163 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
164 | static struct resource bfin_uart0_resources[] = { | ||
164 | { | 165 | { |
165 | .start = 0xFFC00400, | 166 | .start = BFIN_UART_THR, |
166 | .end = 0xFFC004FF, | 167 | .end = BFIN_UART_GCTL+2, |
167 | .flags = IORESOURCE_MEM, | 168 | .flags = IORESOURCE_MEM, |
168 | }, | 169 | }, |
170 | { | ||
171 | .start = IRQ_UART_RX, | ||
172 | .end = IRQ_UART_RX+1, | ||
173 | .flags = IORESOURCE_IRQ, | ||
174 | }, | ||
175 | { | ||
176 | .start = IRQ_UART_ERROR, | ||
177 | .end = IRQ_UART_ERROR, | ||
178 | .flags = IORESOURCE_IRQ, | ||
179 | }, | ||
180 | { | ||
181 | .start = CH_UART_TX, | ||
182 | .end = CH_UART_TX, | ||
183 | .flags = IORESOURCE_DMA, | ||
184 | }, | ||
185 | { | ||
186 | .start = CH_UART_RX, | ||
187 | .end = CH_UART_RX, | ||
188 | .flags = IORESOURCE_DMA, | ||
189 | }, | ||
190 | }; | ||
191 | |||
192 | unsigned short bfin_uart0_peripherals[] = { | ||
193 | P_UART0_TX, P_UART0_RX, 0 | ||
169 | }; | 194 | }; |
170 | 195 | ||
171 | static struct platform_device bfin_uart_device = { | 196 | static struct platform_device bfin_uart0_device = { |
172 | .name = "bfin-uart", | 197 | .name = "bfin-uart", |
173 | .id = 1, | 198 | .id = 0, |
174 | .num_resources = ARRAY_SIZE(bfin_uart_resources), | 199 | .num_resources = ARRAY_SIZE(bfin_uart0_resources), |
175 | .resource = bfin_uart_resources, | 200 | .resource = bfin_uart0_resources, |
201 | .dev = { | ||
202 | .platform_data = &bfin_uart0_peripherals, /* Passed to driver */ | ||
203 | }, | ||
176 | }; | 204 | }; |
177 | #endif | 205 | #endif |
206 | #endif | ||
178 | 207 | ||
179 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 208 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
180 | #ifdef CONFIG_BFIN_SIR0 | 209 | #ifdef CONFIG_BFIN_SIR0 |
@@ -412,7 +441,9 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
412 | #endif | 441 | #endif |
413 | 442 | ||
414 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 443 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
415 | &bfin_uart_device, | 444 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
445 | &bfin_uart0_device, | ||
446 | #endif | ||
416 | #endif | 447 | #endif |
417 | 448 | ||
418 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 449 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c index 8ba7252455e1..6c33397355b3 100644 --- a/arch/blackfin/mach-bf561/boards/tepla.c +++ b/arch/blackfin/mach-bf561/boards/tepla.c | |||
@@ -42,6 +42,52 @@ static struct platform_device smc91x_device = { | |||
42 | .resource = smc91x_resources, | 42 | .resource = smc91x_resources, |
43 | }; | 43 | }; |
44 | 44 | ||
45 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | ||
46 | #ifdef CONFIG_SERIAL_BFIN_UART0 | ||
47 | static struct resource bfin_uart0_resources[] = { | ||
48 | { | ||
49 | .start = BFIN_UART_THR, | ||
50 | .end = BFIN_UART_GCTL+2, | ||
51 | .flags = IORESOURCE_MEM, | ||
52 | }, | ||
53 | { | ||
54 | .start = IRQ_UART_RX, | ||
55 | .end = IRQ_UART_RX+1, | ||
56 | .flags = IORESOURCE_IRQ, | ||
57 | }, | ||
58 | { | ||
59 | .start = IRQ_UART_ERROR, | ||
60 | .end = IRQ_UART_ERROR, | ||
61 | .flags = IORESOURCE_IRQ, | ||
62 | }, | ||
63 | { | ||
64 | .start = CH_UART_TX, | ||
65 | .end = CH_UART_TX, | ||
66 | .flags = IORESOURCE_DMA, | ||
67 | }, | ||
68 | { | ||
69 | .start = CH_UART_RX, | ||
70 | .end = CH_UART_RX, | ||
71 | .flags = IORESOURCE_DMA, | ||
72 | }, | ||
73 | }; | ||
74 | |||
75 | unsigned short bfin_uart0_peripherals[] = { | ||
76 | P_UART0_TX, P_UART0_RX, 0 | ||
77 | }; | ||
78 | |||
79 | static struct platform_device bfin_uart0_device = { | ||
80 | .name = "bfin-uart", | ||
81 | .id = 0, | ||
82 | .num_resources = ARRAY_SIZE(bfin_uart0_resources), | ||
83 | .resource = bfin_uart0_resources, | ||
84 | .dev = { | ||
85 | .platform_data = &bfin_uart0_peripherals, /* Passed to driver */ | ||
86 | }, | ||
87 | }; | ||
88 | #endif | ||
89 | #endif | ||
90 | |||
45 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 91 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
46 | #ifdef CONFIG_BFIN_SIR0 | 92 | #ifdef CONFIG_BFIN_SIR0 |
47 | static struct resource bfin_sir0_resources[] = { | 93 | static struct resource bfin_sir0_resources[] = { |
@@ -73,6 +119,13 @@ static struct platform_device bfin_sir0_device = { | |||
73 | 119 | ||
74 | static struct platform_device *tepla_devices[] __initdata = { | 120 | static struct platform_device *tepla_devices[] __initdata = { |
75 | &smc91x_device, | 121 | &smc91x_device, |
122 | |||
123 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | ||
124 | #ifdef CONFIG_SERIAL_BFIN_UART0 | ||
125 | &bfin_uart0_device, | ||
126 | #endif | ||
127 | #endif | ||
128 | |||
76 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 129 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
77 | #ifdef CONFIG_BFIN_SIR0 | 130 | #ifdef CONFIG_BFIN_SIR0 |
78 | &bfin_sir0_device, | 131 | &bfin_sir0_device, |