History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: blackfin: Fixup export.h includes Blackfin: add serial TX IRQ in individual platform resource

Linus Torvalds committed 15 years ago

Commit fc21a2d2 parents bc5b8a9 905905428 files · +304 −56Browse files

Unified · Split

28 files
  1. arch/blackfin/include/asm/bfin_serial.h +2 −0
  2. arch/blackfin/mach-bf518/boards/ezbrd.c +12 −2
  3. arch/blackfin/mach-bf518/boards/tcm-bf518.c +12 −2
  4. arch/blackfin/mach-bf527/boards/ad7160eval.c +12 −2
  5. arch/blackfin/mach-bf527/boards/cm_bf527.c +13 −3
  6. arch/blackfin/mach-bf527/boards/ezbrd.c +13 −3
  7. arch/blackfin/mach-bf527/boards/ezkit.c +12 −2
  8. arch/blackfin/mach-bf527/boards/tll6527m.c +12 −2
  9. arch/blackfin/mach-bf533/boards/H8606.c +6 −1
  10. arch/blackfin/mach-bf533/boards/blackstamp.c +6 −1
  11. arch/blackfin/mach-bf533/boards/cm_bf533.c +6 −1
  12. arch/blackfin/mach-bf533/boards/ezkit.c +6 −1
  13. arch/blackfin/mach-bf533/boards/ip0x.c +6 −1
  14. arch/blackfin/mach-bf533/boards/stamp.c +6 −1
  15. arch/blackfin/mach-bf537/boards/cm_bf537e.c +13 −3
  16. arch/blackfin/mach-bf537/boards/cm_bf537u.c +13 −3
  17. arch/blackfin/mach-bf537/boards/dnp5370.c +13 −3
  18. arch/blackfin/mach-bf537/boards/minotaur.c +12 −2
  19. arch/blackfin/mach-bf537/boards/pnav10.c +13 −2
  20. arch/blackfin/mach-bf537/boards/stamp.c +13 −3
  21. arch/blackfin/mach-bf537/boards/tcm_bf537.c +13 −3
  22. arch/blackfin/mach-bf538/boards/ezkit.c +18 −3
  23. arch/blackfin/mach-bf548/boards/cm_bf548.c +24 −4
  24. arch/blackfin/mach-bf548/boards/ezkit.c +24 −4
  25. arch/blackfin/mach-bf561/boards/acvilon.c +6 −1
  26. arch/blackfin/mach-bf561/boards/cm_bf561.c +6 −1
  27. arch/blackfin/mach-bf561/boards/ezkit.c +6 −1
  28. arch/blackfin/mach-bf561/boards/tepla.c +6 −1
arch/blackfin/include/asm/bfin_serial.h+2−0
@@ -32,6 +32,8 @@ struct work_struct; · 31 unmodified lines
3232 struct bfin_serial_port {
3333 struct uart_port port;
3434 unsigned int old_status;
35+ int tx_irq;
36+ int rx_irq;
3537 int status_irq;
3638 #ifndef BFIN_UART_BF54X_STYLE
3739 unsigned int lsr;
arch/blackfin/mach-bf518/boards/ezbrd.c+12−2
@@ -372,9 +372,14 @@ static struct resource bfin_uart0_resources[] = { · 371 unmodified lines
372372 .end = UART0_GCTL+2,
373373 .flags = IORESOURCE_MEM,
374374 },
375+ {
376+ .start = IRQ_UART0_TX,
377+ .end = IRQ_UART0_TX,
378+ .flags = IORESOURCE_IRQ,
379+ },
375380 {
376381 .start = IRQ_UART0_RX,
377− .end = IRQ_UART0_RX+1,
382+ .end = IRQ_UART0_RX,
378383 .flags = IORESOURCE_IRQ,
379384 },
380385 {
@@ -415,9 +420,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
415420 .end = UART1_GCTL+2,
416421 .flags = IORESOURCE_MEM,
417422 },
423+ {
424+ .start = IRQ_UART1_TX,
425+ .end = IRQ_UART1_TX,
426+ .flags = IORESOURCE_IRQ,
427+ },
418428 {
419429 .start = IRQ_UART1_RX,
420− .end = IRQ_UART1_RX+1,
430+ .end = IRQ_UART1_RX,
421431 .flags = IORESOURCE_IRQ,
422432 },
423433 {
arch/blackfin/mach-bf518/boards/tcm-bf518.c+12−2
@@ -308,9 +308,14 @@ static struct resource bfin_uart0_resources[] = { · 307 unmodified lines
308308 .end = UART0_GCTL+2,
309309 .flags = IORESOURCE_MEM,
310310 },
311+ {
312+ .start = IRQ_UART0_TX,
313+ .end = IRQ_UART0_TX,
314+ .flags = IORESOURCE_IRQ,
315+ },
311316 {
312317 .start = IRQ_UART0_RX,
313− .end = IRQ_UART0_RX+1,
318+ .end = IRQ_UART0_RX,
314319 .flags = IORESOURCE_IRQ,
315320 },
316321 {
@@ -351,9 +356,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
351356 .end = UART1_GCTL+2,
352357 .flags = IORESOURCE_MEM,
353358 },
359+ {
360+ .start = IRQ_UART1_TX,
361+ .end = IRQ_UART1_TX,
362+ .flags = IORESOURCE_IRQ,
363+ },
354364 {
355365 .start = IRQ_UART1_RX,
356− .end = IRQ_UART1_RX+1,
366+ .end = IRQ_UART1_RX,
357367 .flags = IORESOURCE_IRQ,
358368 },
359369 {
arch/blackfin/mach-bf527/boards/ad7160eval.c+12−2
@@ -380,9 +380,14 @@ static struct resource bfin_uart0_resources[] = { · 379 unmodified lines
380380 .end = UART0_GCTL+2,
381381 .flags = IORESOURCE_MEM,
382382 },
383+ {
384+ .start = IRQ_UART0_TX,
385+ .end = IRQ_UART0_TX,
386+ .flags = IORESOURCE_IRQ,
387+ },
383388 {
384389 .start = IRQ_UART0_RX,
385− .end = IRQ_UART0_RX+1,
390+ .end = IRQ_UART0_RX,
386391 .flags = IORESOURCE_IRQ,
387392 },
388393 {
@@ -423,9 +428,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
423428 .end = UART1_GCTL+2,
424429 .flags = IORESOURCE_MEM,
425430 },
431+ {
432+ .start = IRQ_UART1_TX,
433+ .end = IRQ_UART1_TX,
434+ .flags = IORESOURCE_IRQ,
435+ },
426436 {
427437 .start = IRQ_UART1_RX,
428− .end = IRQ_UART1_RX+1,
438+ .end = IRQ_UART1_RX,
429439 .flags = IORESOURCE_IRQ,
430440 },
431441 {
arch/blackfin/mach-bf527/boards/cm_bf527.c+13−3
@@ -8,6 +8,7 @@ · 7 unmodified lines
88 */
99
1010 #include <linux/device.h>
11+#include <linux/export.h>
1112 #include <linux/platform_device.h>
1213 #include <linux/mtd/mtd.h>
1314 #include <linux/mtd/partitions.h>
@@ -538,9 +539,14 @@ static struct resource bfin_uart0_resources[] = { · 524 unmodified lines
538539 .end = UART0_GCTL+2,
539540 .flags = IORESOURCE_MEM,
540541 },
542+ {
543+ .start = IRQ_UART0_TX,
544+ .end = IRQ_UART0_TX,
545+ .flags = IORESOURCE_IRQ,
546+ },
541547 {
542548 .start = IRQ_UART0_RX,
543− .end = IRQ_UART0_RX+1,
549+ .end = IRQ_UART0_RX,
544550 .flags = IORESOURCE_IRQ,
545551 },
546552 {
@@ -581,9 +587,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
581587 .end = UART1_GCTL+2,
582588 .flags = IORESOURCE_MEM,
583589 },
590+ {
591+ .start = IRQ_UART1_TX,
592+ .end = IRQ_UART1_TX,
593+ .flags = IORESOURCE_IRQ,
594+ },
584595 {
585596 .start = IRQ_UART1_RX,
586− .end = IRQ_UART1_RX+1,
597+ .end = IRQ_UART1_RX,
587598 .flags = IORESOURCE_IRQ,
588599 },
589600 {
@@ -801,7 +812,6 @@ static struct platform_device bfin_sport1_uart_device = { · 211 unmodified lines
801812 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
802813 #include <linux/input.h>
803814 #include <linux/gpio_keys.h>
804−#include <linux/export.h>
805815
806816 static struct gpio_keys_button bfin_gpio_keys_table[] = {
807817 {BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"},
arch/blackfin/mach-bf527/boards/ezbrd.c+13−3
@@ -7,6 +7,7 @@ · 6 unmodified lines
77 */
88
99 #include <linux/device.h>
10+#include <linux/export.h>
1011 #include <linux/platform_device.h>
1112 #include <linux/mtd/mtd.h>
1213 #include <linux/mtd/partitions.h>
@@ -416,9 +417,14 @@ static struct resource bfin_uart0_resources[] = { · 403 unmodified lines
416417 .end = UART0_GCTL+2,
417418 .flags = IORESOURCE_MEM,
418419 },
420+ {
421+ .start = IRQ_UART0_TX,
422+ .end = IRQ_UART0_TX,
423+ .flags = IORESOURCE_IRQ,
424+ },
419425 {
420426 .start = IRQ_UART0_RX,
421− .end = IRQ_UART0_RX+1,
427+ .end = IRQ_UART0_RX,
422428 .flags = IORESOURCE_IRQ,
423429 },
424430 {
@@ -459,9 +465,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
459465 .end = UART1_GCTL+2,
460466 .flags = IORESOURCE_MEM,
461467 },
468+ {
469+ .start = IRQ_UART1_TX,
470+ .end = IRQ_UART1_TX,
471+ .flags = IORESOURCE_IRQ,
472+ },
462473 {
463474 .start = IRQ_UART1_RX,
464− .end = IRQ_UART1_RX+1,
475+ .end = IRQ_UART1_RX,
465476 .flags = IORESOURCE_IRQ,
466477 },
467478 {
@@ -674,7 +685,6 @@ static struct platform_device bfin_sport1_uart_device = { · 206 unmodified lines
674685 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
675686 #include <linux/input.h>
676687 #include <linux/gpio_keys.h>
677−#include <linux/export.h>
678688
679689 static struct gpio_keys_button bfin_gpio_keys_table[] = {
680690 {BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"},
arch/blackfin/mach-bf527/boards/ezkit.c+12−2
@@ -710,9 +710,14 @@ static struct resource bfin_uart0_resources[] = { · 709 unmodified lines
710710 .end = UART0_GCTL+2,
711711 .flags = IORESOURCE_MEM,
712712 },
713+ {
714+ .start = IRQ_UART0_TX,
715+ .end = IRQ_UART0_TX,
716+ .flags = IORESOURCE_IRQ,
717+ },
713718 {
714719 .start = IRQ_UART0_RX,
715− .end = IRQ_UART0_RX+1,
720+ .end = IRQ_UART0_RX,
716721 .flags = IORESOURCE_IRQ,
717722 },
718723 {
@@ -753,9 +758,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
753758 .end = UART1_GCTL+2,
754759 .flags = IORESOURCE_MEM,
755760 },
761+ {
762+ .start = IRQ_UART1_TX,
763+ .end = IRQ_UART1_TX,
764+ .flags = IORESOURCE_IRQ,
765+ },
756766 {
757767 .start = IRQ_UART1_RX,
758− .end = IRQ_UART1_RX+1,
768+ .end = IRQ_UART1_RX,
759769 .flags = IORESOURCE_IRQ,
760770 },
761771 {
arch/blackfin/mach-bf527/boards/tll6527m.c+12−2
@@ -495,9 +495,14 @@ static struct resource bfin_uart0_resources[] = { · 494 unmodified lines
495495 .end = UART0_GCTL+2,
496496 .flags = IORESOURCE_MEM,
497497 },
498+ {
499+ .start = IRQ_UART0_TX,
500+ .end = IRQ_UART0_TX,
501+ .flags = IORESOURCE_IRQ,
502+ },
498503 {
499504 .start = IRQ_UART0_RX,
500− .end = IRQ_UART0_RX+1,
505+ .end = IRQ_UART0_RX,
501506 .flags = IORESOURCE_IRQ,
502507 },
503508 {
@@ -539,9 +544,14 @@ static struct resource bfin_uart1_resources[] = { · 35 unmodified lines
539544 .end = UART1_GCTL+2,
540545 .flags = IORESOURCE_MEM,
541546 },
547+ {
548+ .start = IRQ_UART1_TX,
549+ .end = IRQ_UART1_TX,
550+ .flags = IORESOURCE_IRQ,
551+ },
542552 {
543553 .start = IRQ_UART1_RX,
544− .end = IRQ_UART1_RX+1,
554+ .end = IRQ_UART1_RX,
545555 .flags = IORESOURCE_IRQ,
546556 },
547557 {
arch/blackfin/mach-bf533/boards/H8606.c+6−1
@@ -237,9 +237,14 @@ static struct resource bfin_uart0_resources[] = { · 236 unmodified lines
237237 .end = BFIN_UART_GCTL+2,
238238 .flags = IORESOURCE_MEM,
239239 },
240+ {
241+ .start = IRQ_UART0_TX,
242+ .end = IRQ_UART0_TX,
243+ .flags = IORESOURCE_IRQ,
244+ },
240245 {
241246 .start = IRQ_UART0_RX,
242− .end = IRQ_UART0_RX + 1,
247+ .end = IRQ_UART0_RX,
243248 .flags = IORESOURCE_IRQ,
244249 },
245250 {
arch/blackfin/mach-bf533/boards/blackstamp.c+6−1
@@ -192,9 +192,14 @@ static struct resource bfin_uart0_resources[] = { · 191 unmodified lines
192192 .end = BFIN_UART_GCTL+2,
193193 .flags = IORESOURCE_MEM,
194194 },
195+ {
196+ .start = IRQ_UART0_TX,
197+ .end = IRQ_UART0_TX,
198+ .flags = IORESOURCE_IRQ,
199+ },
195200 {
196201 .start = IRQ_UART0_RX,
197− .end = IRQ_UART0_RX + 1,
202+ .end = IRQ_UART0_RX,
198203 .flags = IORESOURCE_IRQ,
199204 },
200205 {
arch/blackfin/mach-bf533/boards/cm_bf533.c+6−1
@@ -220,9 +220,14 @@ static struct resource bfin_uart0_resources[] = { · 219 unmodified lines
220220 .end = BFIN_UART_GCTL+2,
221221 .flags = IORESOURCE_MEM,
222222 },
223+ {
224+ .start = IRQ_UART0_TX,
225+ .end = IRQ_UART0_TX,
226+ .flags = IORESOURCE_IRQ,
227+ },
223228 {
224229 .start = IRQ_UART0_RX,
225− .end = IRQ_UART0_RX + 1,
230+ .end = IRQ_UART0_RX,
226231 .flags = IORESOURCE_IRQ,
227232 },
228233 {
arch/blackfin/mach-bf533/boards/ezkit.c+6−1
@@ -291,9 +291,14 @@ static struct resource bfin_uart0_resources[] = { · 290 unmodified lines
291291 .end = BFIN_UART_GCTL+2,
292292 .flags = IORESOURCE_MEM,
293293 },
294+ {
295+ .start = IRQ_UART0_TX,
296+ .end = IRQ_UART0_TX,
297+ .flags = IORESOURCE_IRQ,
298+ },
294299 {
295300 .start = IRQ_UART0_RX,
296− .end = IRQ_UART0_RX + 1,
301+ .end = IRQ_UART0_RX,
297302 .flags = IORESOURCE_IRQ,
298303 },
299304 {
arch/blackfin/mach-bf533/boards/ip0x.c+6−1
@@ -150,9 +150,14 @@ static struct resource bfin_uart0_resources[] = { · 149 unmodified lines
150150 .end = BFIN_UART_GCTL+2,
151151 .flags = IORESOURCE_MEM,
152152 },
153+ {
154+ .start = IRQ_UART0_TX,
155+ .end = IRQ_UART0_TX,
156+ .flags = IORESOURCE_IRQ,
157+ },
153158 {
154159 .start = IRQ_UART0_RX,
155− .end = IRQ_UART0_RX + 1,
160+ .end = IRQ_UART0_RX,
156161 .flags = IORESOURCE_IRQ,
157162 },
158163 {
arch/blackfin/mach-bf533/boards/stamp.c+6−1
@@ -297,9 +297,14 @@ static struct resource bfin_uart0_resources[] = { · 296 unmodified lines
297297 .end = BFIN_UART_GCTL+2,
298298 .flags = IORESOURCE_MEM,
299299 },
300+ {
301+ .start = IRQ_UART0_TX,
302+ .end = IRQ_UART0_TX,
303+ .flags = IORESOURCE_IRQ,
304+ },
300305 {
301306 .start = IRQ_UART0_RX,
302− .end = IRQ_UART0_RX + 1,
307+ .end = IRQ_UART0_RX,
303308 .flags = IORESOURCE_IRQ,
304309 },
305310 {
arch/blackfin/mach-bf537/boards/cm_bf537e.c+13−3
@@ -8,6 +8,7 @@ · 7 unmodified lines
88 */
99
1010 #include <linux/device.h>
11+#include <linux/export.h>
1112 #include <linux/etherdevice.h>
1213 #include <linux/platform_device.h>
1314 #include <linux/mtd/mtd.h>
@@ -304,9 +305,14 @@ static struct resource bfin_uart0_resources[] = { · 290 unmodified lines
304305 .end = UART0_GCTL+2,
305306 .flags = IORESOURCE_MEM,
306307 },
308+ {
309+ .start = IRQ_UART0_TX,
310+ .end = IRQ_UART0_TX,
311+ .flags = IORESOURCE_IRQ,
312+ },
307313 {
308314 .start = IRQ_UART0_RX,
309− .end = IRQ_UART0_RX+1,
315+ .end = IRQ_UART0_RX,
310316 .flags = IORESOURCE_IRQ,
311317 },
312318 {
@@ -365,9 +371,14 @@ static struct resource bfin_uart1_resources[] = { · 52 unmodified lines
365371 .end = UART1_GCTL+2,
366372 .flags = IORESOURCE_MEM,
367373 },
374+ {
375+ .start = IRQ_UART1_TX,
376+ .end = IRQ_UART1_TX,
377+ .flags = IORESOURCE_IRQ,
378+ },
368379 {
369380 .start = IRQ_UART1_RX,
370− .end = IRQ_UART1_RX+1,
381+ .end = IRQ_UART1_RX,
371382 .flags = IORESOURCE_IRQ,
372383 },
373384 {
@@ -569,7 +580,6 @@ static struct platform_device bfin_sport1_uart_device = { · 195 unmodified lines
569580
570581 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
571582 #include <linux/bfin_mac.h>
572−#include <linux/export.h>
573583 static const unsigned short bfin_mac_peripherals[] = P_MII0;
574584
575585 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
arch/blackfin/mach-bf537/boards/cm_bf537u.c+13−3
@@ -9,6 +9,7 @@ · 8 unmodified lines
99
1010 #include <linux/device.h>
1111 #include <linux/etherdevice.h>
12+#include <linux/export.h>
1213 #include <linux/platform_device.h>
1314 #include <linux/mtd/mtd.h>
1415 #include <linux/mtd/partitions.h>
@@ -305,9 +306,14 @@ static struct resource bfin_uart0_resources[] = { · 290 unmodified lines
305306 .end = UART0_GCTL+2,
306307 .flags = IORESOURCE_MEM,
307308 },
309+ {
310+ .start = IRQ_UART0_TX,
311+ .end = IRQ_UART0_TX,
312+ .flags = IORESOURCE_IRQ,
313+ },
308314 {
309315 .start = IRQ_UART0_RX,
310− .end = IRQ_UART0_RX+1,
316+ .end = IRQ_UART0_RX,
311317 .flags = IORESOURCE_IRQ,
312318 },
313319 {
@@ -348,9 +354,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
348354 .end = UART1_GCTL+2,
349355 .flags = IORESOURCE_MEM,
350356 },
357+ {
358+ .start = IRQ_UART1_TX,
359+ .end = IRQ_UART1_TX,
360+ .flags = IORESOURCE_IRQ,
361+ },
351362 {
352363 .start = IRQ_UART1_RX,
353− .end = IRQ_UART1_RX+1,
364+ .end = IRQ_UART1_RX,
354365 .flags = IORESOURCE_IRQ,
355366 },
356367 {
@@ -534,7 +545,6 @@ static struct platform_device bfin_sport1_uart_device = { · 177 unmodified lines
534545
535546 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
536547 #include <linux/bfin_mac.h>
537−#include <linux/export.h>
538548 static const unsigned short bfin_mac_peripherals[] = P_MII0;
539549
540550 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
arch/blackfin/mach-bf537/boards/dnp5370.c+13−3
@@ -12,6 +12,7 @@ · 11 unmodified lines
1212 */
1313
1414 #include <linux/device.h>
15+#include <linux/export.h>
1516 #include <linux/kernel.h>
1617 #include <linux/platform_device.h>
1718 #include <linux/io.h>
@@ -49,7 +50,6 @@ static struct platform_device rtc_device = { · 31 unmodified lines
4950
5051 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
5152 #include <linux/bfin_mac.h>
52−#include <linux/export.h>
5353 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
5454
5555 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
@@ -236,9 +236,14 @@ static struct resource bfin_uart0_resources[] = { · 180 unmodified lines
236236 .end = UART0_GCTL+2,
237237 .flags = IORESOURCE_MEM,
238238 },
239+ {
240+ .start = IRQ_UART0_TX,
241+ .end = IRQ_UART0_TX,
242+ .flags = IORESOURCE_IRQ,
243+ },
239244 {
240245 .start = IRQ_UART0_RX,
241− .end = IRQ_UART0_RX+1,
246+ .end = IRQ_UART0_RX,
242247 .flags = IORESOURCE_IRQ,
243248 },
244249 {
@@ -280,9 +285,14 @@ static struct resource bfin_uart1_resources[] = { · 35 unmodified lines
280285 .end = UART1_GCTL+2,
281286 .flags = IORESOURCE_MEM,
282287 },
288+ {
289+ .start = IRQ_UART1_TX,
290+ .end = IRQ_UART1_TX,
291+ .flags = IORESOURCE_IRQ,
292+ },
283293 {
284294 .start = IRQ_UART1_RX,
285− .end = IRQ_UART1_RX+1,
295+ .end = IRQ_UART1_RX,
286296 .flags = IORESOURCE_IRQ,
287297 },
288298 {
arch/blackfin/mach-bf537/boards/minotaur.c+12−2
@@ -239,9 +239,14 @@ static struct resource bfin_uart0_resources[] = { · 238 unmodified lines
239239 .end = UART0_GCTL+2,
240240 .flags = IORESOURCE_MEM,
241241 },
242+ {
243+ .start = IRQ_UART0_TX,
244+ .end = IRQ_UART0_TX,
245+ .flags = IORESOURCE_IRQ,
246+ },
242247 {
243248 .start = IRQ_UART0_RX,
244− .end = IRQ_UART0_RX+1,
249+ .end = IRQ_UART0_RX,
245250 .flags = IORESOURCE_IRQ,
246251 },
247252 {
@@ -282,9 +287,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
282287 .end = UART1_GCTL+2,
283288 .flags = IORESOURCE_MEM,
284289 },
290+ {
291+ .start = IRQ_UART1_TX,
292+ .end = IRQ_UART1_TX,
293+ .flags = IORESOURCE_IRQ,
294+ },
285295 {
286296 .start = IRQ_UART1_RX,
287− .end = IRQ_UART1_RX+1,
297+ .end = IRQ_UART1_RX,
288298 .flags = IORESOURCE_IRQ,
289299 },
290300 {
arch/blackfin/mach-bf537/boards/pnav10.c+13−2
@@ -8,6 +8,7 @@ · 7 unmodified lines
88
99 #include <linux/device.h>
1010 #include <linux/etherdevice.h>
11+#include <linux/export.h>
1112 #include <linux/platform_device.h>
1213 #include <linux/mtd/mtd.h>
1314 #include <linux/mtd/partitions.h>
@@ -308,9 +309,14 @@ static struct resource bfin_uart0_resources[] = { · 294 unmodified lines
308309 .end = UART0_GCTL+2,
309310 .flags = IORESOURCE_MEM,
310311 },
312+ {
313+ .start = IRQ_UART0_TX,
314+ .end = IRQ_UART0_TX,
315+ .flags = IORESOURCE_IRQ,
316+ },
311317 {
312318 .start = IRQ_UART0_RX,
313− .end = IRQ_UART0_RX+1,
319+ .end = IRQ_UART0_RX,
314320 .flags = IORESOURCE_IRQ,
315321 },
316322 {
@@ -351,9 +357,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
351357 .end = UART1_GCTL+2,
352358 .flags = IORESOURCE_MEM,
353359 },
360+ {
361+ .start = IRQ_UART1_TX,
362+ .end = IRQ_UART1_TX,
363+ .flags = IORESOURCE_IRQ,
364+ },
354365 {
355366 .start = IRQ_UART1_RX,
356− .end = IRQ_UART1_RX+1,
367+ .end = IRQ_UART1_RX,
357368 .flags = IORESOURCE_IRQ,
358369 },
359370 {
arch/blackfin/mach-bf537/boards/stamp.c+13−3
@@ -7,6 +7,7 @@ · 6 unmodified lines
77 */
88
99 #include <linux/device.h>
10+#include <linux/export.h>
1011 #include <linux/kernel.h>
1112 #include <linux/platform_device.h>
1213 #include <linux/io.h>
@@ -1565,9 +1566,14 @@ static struct resource bfin_uart0_resources[] = { · 1552 unmodified lines
15651566 .end = UART0_GCTL+2,
15661567 .flags = IORESOURCE_MEM,
15671568 },
1569+ {
1570+ .start = IRQ_UART0_TX,
1571+ .end = IRQ_UART0_TX,
1572+ .flags = IORESOURCE_IRQ,
1573+ },
15681574 {
15691575 .start = IRQ_UART0_RX,
1570− .end = IRQ_UART0_RX+1,
1576+ .end = IRQ_UART0_RX,
15711577 .flags = IORESOURCE_IRQ,
15721578 },
15731579 {
@@ -1620,9 +1626,14 @@ static struct resource bfin_uart1_resources[] = { · 46 unmodified lines
16201626 .end = UART1_GCTL+2,
16211627 .flags = IORESOURCE_MEM,
16221628 },
1629+ {
1630+ .start = IRQ_UART1_TX,
1631+ .end = IRQ_UART1_TX,
1632+ .flags = IORESOURCE_IRQ,
1633+ },
16231634 {
16241635 .start = IRQ_UART1_RX,
1625− .end = IRQ_UART1_RX+1,
1636+ .end = IRQ_UART1_RX,
16261637 .flags = IORESOURCE_IRQ,
16271638 },
16281639 {
@@ -1992,7 +2003,6 @@ static struct adp8870_backlight_platform_data adp8870_pdata = { · 363 unmodified lines
19922003
19932004 #if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE)
19942005 #include <linux/i2c/adp8860.h>
1995−#include <linux/export.h>
19962006 static struct led_info adp8860_leds[] = {
19972007 {
19982008 .name = "adp8860-led7",
arch/blackfin/mach-bf537/boards/tcm_bf537.c+13−3
@@ -9,6 +9,7 @@ · 8 unmodified lines
99
1010 #include <linux/device.h>
1111 #include <linux/etherdevice.h>
12+#include <linux/export.h>
1213 #include <linux/platform_device.h>
1314 #include <linux/mtd/mtd.h>
1415 #include <linux/mtd/partitions.h>
@@ -305,9 +306,14 @@ static struct resource bfin_uart0_resources[] = { · 290 unmodified lines
305306 .end = UART0_GCTL+2,
306307 .flags = IORESOURCE_MEM,
307308 },
309+ {
310+ .start = IRQ_UART0_TX,
311+ .end = IRQ_UART0_TX,
312+ .flags = IORESOURCE_IRQ,
313+ },
308314 {
309315 .start = IRQ_UART0_RX,
310− .end = IRQ_UART0_RX+1,
316+ .end = IRQ_UART0_RX,
311317 .flags = IORESOURCE_IRQ,
312318 },
313319 {
@@ -348,9 +354,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
348354 .end = UART1_GCTL+2,
349355 .flags = IORESOURCE_MEM,
350356 },
357+ {
358+ .start = IRQ_UART1_TX,
359+ .end = IRQ_UART1_TX,
360+ .flags = IORESOURCE_IRQ,
361+ },
351362 {
352363 .start = IRQ_UART1_RX,
353− .end = IRQ_UART1_RX+1,
364+ .end = IRQ_UART1_RX,
354365 .flags = IORESOURCE_IRQ,
355366 },
356367 {
@@ -536,7 +547,6 @@ static struct platform_device bfin_sport1_uart_device = { · 179 unmodified lines
536547
537548 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
538549 #include <linux/bfin_mac.h>
539−#include <linux/export.h>
540550 static const unsigned short bfin_mac_peripherals[] = P_MII0;
541551
542552 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
arch/blackfin/mach-bf538/boards/ezkit.c+18−3
@@ -48,9 +48,14 @@ static struct resource bfin_uart0_resources[] = { · 47 unmodified lines
4848 .end = UART0_GCTL+2,
4949 .flags = IORESOURCE_MEM,
5050 },
51+ {
52+ .start = IRQ_UART0_TX,
53+ .end = IRQ_UART0_TX,
54+ .flags = IORESOURCE_IRQ,
55+ },
5156 {
5257 .start = IRQ_UART0_RX,
53− .end = IRQ_UART0_RX+1,
58+ .end = IRQ_UART0_RX,
5459 .flags = IORESOURCE_IRQ,
5560 },
5661 {
@@ -103,9 +108,14 @@ static struct resource bfin_uart1_resources[] = { · 46 unmodified lines
103108 .end = UART1_GCTL+2,
104109 .flags = IORESOURCE_MEM,
105110 },
111+ {
112+ .start = IRQ_UART1_TX,
113+ .end = IRQ_UART1_TX,
114+ .flags = IORESOURCE_IRQ,
115+ },
106116 {
107117 .start = IRQ_UART1_RX,
108− .end = IRQ_UART1_RX+1,
118+ .end = IRQ_UART1_RX,
109119 .flags = IORESOURCE_IRQ,
110120 },
111121 {
@@ -146,9 +156,14 @@ static struct resource bfin_uart2_resources[] = { · 34 unmodified lines
146156 .end = UART2_GCTL+2,
147157 .flags = IORESOURCE_MEM,
148158 },
159+ {
160+ .start = IRQ_UART2_TX,
161+ .end = IRQ_UART2_TX,
162+ .flags = IORESOURCE_IRQ,
163+ },
149164 {
150165 .start = IRQ_UART2_RX,
151− .end = IRQ_UART2_RX+1,
166+ .end = IRQ_UART2_RX,
152167 .flags = IORESOURCE_IRQ,
153168 },
154169 {
arch/blackfin/mach-bf548/boards/cm_bf548.c+24−4
@@ -134,9 +134,14 @@ static struct resource bfin_uart0_resources[] = { · 133 unmodified lines
134134 .end = UART0_RBR+2,
135135 .flags = IORESOURCE_MEM,
136136 },
137+ {
138+ .start = IRQ_UART0_TX,
139+ .end = IRQ_UART0_TX,
140+ .flags = IORESOURCE_IRQ,
141+ },
137142 {
138143 .start = IRQ_UART0_RX,
139− .end = IRQ_UART0_RX+1,
144+ .end = IRQ_UART0_RX,
140145 .flags = IORESOURCE_IRQ,
141146 },
142147 {
@@ -177,9 +182,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
177182 .end = UART1_RBR+2,
178183 .flags = IORESOURCE_MEM,
179184 },
185+ {
186+ .start = IRQ_UART1_TX,
187+ .end = IRQ_UART1_TX,
188+ .flags = IORESOURCE_IRQ,
189+ },
180190 {
181191 .start = IRQ_UART1_RX,
182− .end = IRQ_UART1_RX+1,
192+ .end = IRQ_UART1_RX,
183193 .flags = IORESOURCE_IRQ,
184194 },
185195 {
@@ -236,9 +246,14 @@ static struct resource bfin_uart2_resources[] = { · 50 unmodified lines
236246 .end = UART2_RBR+2,
237247 .flags = IORESOURCE_MEM,
238248 },
249+ {
250+ .start = IRQ_UART2_TX,
251+ .end = IRQ_UART2_TX,
252+ .flags = IORESOURCE_IRQ,
253+ },
239254 {
240255 .start = IRQ_UART2_RX,
241− .end = IRQ_UART2_RX+1,
256+ .end = IRQ_UART2_RX,
242257 .flags = IORESOURCE_IRQ,
243258 },
244259 {
@@ -279,9 +294,14 @@ static struct resource bfin_uart3_resources[] = { · 34 unmodified lines
279294 .end = UART3_RBR+2,
280295 .flags = IORESOURCE_MEM,
281296 },
297+ {
298+ .start = IRQ_UART3_TX,
299+ .end = IRQ_UART3_TX,
300+ .flags = IORESOURCE_IRQ,
301+ },
282302 {
283303 .start = IRQ_UART3_RX,
284− .end = IRQ_UART3_RX+1,
304+ .end = IRQ_UART3_RX,
285305 .flags = IORESOURCE_IRQ,
286306 },
287307 {
arch/blackfin/mach-bf548/boards/ezkit.c+24−4
@@ -240,9 +240,14 @@ static struct resource bfin_uart0_resources[] = { · 239 unmodified lines
240240 .end = UART0_RBR+2,
241241 .flags = IORESOURCE_MEM,
242242 },
243+ {
244+ .start = IRQ_UART0_TX,
245+ .end = IRQ_UART0_TX,
246+ .flags = IORESOURCE_IRQ,
247+ },
243248 {
244249 .start = IRQ_UART0_RX,
245− .end = IRQ_UART0_RX+1,
250+ .end = IRQ_UART0_RX,
246251 .flags = IORESOURCE_IRQ,
247252 },
248253 {
@@ -283,9 +288,14 @@ static struct resource bfin_uart1_resources[] = { · 34 unmodified lines
283288 .end = UART1_RBR+2,
284289 .flags = IORESOURCE_MEM,
285290 },
291+ {
292+ .start = IRQ_UART1_TX,
293+ .end = IRQ_UART1_TX,
294+ .flags = IORESOURCE_IRQ,
295+ },
286296 {
287297 .start = IRQ_UART1_RX,
288− .end = IRQ_UART1_RX+1,
298+ .end = IRQ_UART1_RX,
289299 .flags = IORESOURCE_IRQ,
290300 },
291301 {
@@ -342,9 +352,14 @@ static struct resource bfin_uart2_resources[] = { · 50 unmodified lines
342352 .end = UART2_RBR+2,
343353 .flags = IORESOURCE_MEM,
344354 },
355+ {
356+ .start = IRQ_UART2_TX,
357+ .end = IRQ_UART2_TX,
358+ .flags = IORESOURCE_IRQ,
359+ },
345360 {
346361 .start = IRQ_UART2_RX,
347− .end = IRQ_UART2_RX+1,
362+ .end = IRQ_UART2_RX,
348363 .flags = IORESOURCE_IRQ,
349364 },
350365 {
@@ -385,9 +400,14 @@ static struct resource bfin_uart3_resources[] = { · 34 unmodified lines
385400 .end = UART3_RBR+2,
386401 .flags = IORESOURCE_MEM,
387402 },
403+ {
404+ .start = IRQ_UART3_TX,
405+ .end = IRQ_UART3_TX,
406+ .flags = IORESOURCE_IRQ,
407+ },
388408 {
389409 .start = IRQ_UART3_RX,
390− .end = IRQ_UART3_RX+1,
410+ .end = IRQ_UART3_RX,
391411 .flags = IORESOURCE_IRQ,
392412 },
393413 {
arch/blackfin/mach-bf561/boards/acvilon.c+6−1
@@ -202,9 +202,14 @@ static struct resource bfin_uart0_resources[] = { · 201 unmodified lines
202202 .end = BFIN_UART_GCTL + 2,
203203 .flags = IORESOURCE_MEM,
204204 },
205+ {
206+ .start = IRQ_UART_TX,
207+ .end = IRQ_UART_TX,
208+ .flags = IORESOURCE_IRQ,
209+ },
205210 {
206211 .start = IRQ_UART_RX,
207− .end = IRQ_UART_RX + 1,
212+ .end = IRQ_UART_RX,
208213 .flags = IORESOURCE_IRQ,
209214 },
210215 {
arch/blackfin/mach-bf561/boards/cm_bf561.c+6−1
@@ -276,9 +276,14 @@ static struct resource bfin_uart0_resources[] = { · 275 unmodified lines
276276 .end = BFIN_UART_GCTL+2,
277277 .flags = IORESOURCE_MEM,
278278 },
279+ {
280+ .start = IRQ_UART_TX,
281+ .end = IRQ_UART_TX,
282+ .flags = IORESOURCE_IRQ,
283+ },
279284 {
280285 .start = IRQ_UART_RX,
281− .end = IRQ_UART_RX+1,
286+ .end = IRQ_UART_RX,
282287 .flags = IORESOURCE_IRQ,
283288 },
284289 {
arch/blackfin/mach-bf561/boards/ezkit.c+6−1
@@ -171,9 +171,14 @@ static struct resource bfin_uart0_resources[] = { · 170 unmodified lines
171171 .end = BFIN_UART_GCTL+2,
172172 .flags = IORESOURCE_MEM,
173173 },
174+ {
175+ .start = IRQ_UART_TX,
176+ .end = IRQ_UART_TX,
177+ .flags = IORESOURCE_IRQ,
178+ },
174179 {
175180 .start = IRQ_UART_RX,
176− .end = IRQ_UART_RX+1,
181+ .end = IRQ_UART_RX,
177182 .flags = IORESOURCE_IRQ,
178183 },
179184 {
arch/blackfin/mach-bf561/boards/tepla.c+6−1
@@ -50,9 +50,14 @@ static struct resource bfin_uart0_resources[] = { · 49 unmodified lines
5050 .end = BFIN_UART_GCTL+2,
5151 .flags = IORESOURCE_MEM,
5252 },
53+ {
54+ .start = IRQ_UART_TX,
55+ .end = IRQ_UART_TX,
56+ .flags = IORESOURCE_IRQ,
57+ },
5358 {
5459 .start = IRQ_UART_RX,
55− .end = IRQ_UART_RX+1,
60+ .end = IRQ_UART_RX,
5661 .flags = IORESOURCE_IRQ,
5762 },
5863 {