diff options
20 files changed, 30 insertions, 20 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 8d3bc84fb612..f7c0efc615c7 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
@@ -275,6 +275,7 @@ choice | |||
275 | config DEBUG_MMP_UART2 | 275 | config DEBUG_MMP_UART2 |
276 | bool "Kernel low-level debugging message via MMP UART2" | 276 | bool "Kernel low-level debugging message via MMP UART2" |
277 | depends on ARCH_MMP | 277 | depends on ARCH_MMP |
278 | select DEBUG_UART_8250 | ||
278 | help | 279 | help |
279 | Say Y here if you want kernel low-level debugging support | 280 | Say Y here if you want kernel low-level debugging support |
280 | on MMP UART2. | 281 | on MMP UART2. |
@@ -282,6 +283,7 @@ choice | |||
282 | config DEBUG_MMP_UART3 | 283 | config DEBUG_MMP_UART3 |
283 | bool "Kernel low-level debugging message via MMP UART3" | 284 | bool "Kernel low-level debugging message via MMP UART3" |
284 | depends on ARCH_MMP | 285 | depends on ARCH_MMP |
286 | select DEBUG_UART_8250 | ||
285 | help | 287 | help |
286 | Say Y here if you want kernel low-level debugging support | 288 | Say Y here if you want kernel low-level debugging support |
287 | on MMP UART3. | 289 | on MMP UART3. |
@@ -326,6 +328,7 @@ choice | |||
326 | config DEBUG_MVEBU_UART | 328 | config DEBUG_MVEBU_UART |
327 | bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)" | 329 | bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)" |
328 | depends on ARCH_MVEBU | 330 | depends on ARCH_MVEBU |
331 | select DEBUG_UART_8250 | ||
329 | help | 332 | help |
330 | Say Y here if you want kernel low-level debugging support | 333 | Say Y here if you want kernel low-level debugging support |
331 | on MVEBU based platforms. | 334 | on MVEBU based platforms. |
@@ -344,6 +347,7 @@ choice | |||
344 | config DEBUG_MVEBU_UART_ALTERNATE | 347 | config DEBUG_MVEBU_UART_ALTERNATE |
345 | bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)" | 348 | bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)" |
346 | depends on ARCH_MVEBU | 349 | depends on ARCH_MVEBU |
350 | select DEBUG_UART_8250 | ||
347 | help | 351 | help |
348 | Say Y here if you want kernel low-level debugging support | 352 | Say Y here if you want kernel low-level debugging support |
349 | on MVEBU based platforms. | 353 | on MVEBU based platforms. |
@@ -365,6 +369,7 @@ choice | |||
365 | config DEBUG_NSPIRE_CLASSIC_UART | 369 | config DEBUG_NSPIRE_CLASSIC_UART |
366 | bool "Kernel low-level debugging via TI-NSPIRE 8250 UART" | 370 | bool "Kernel low-level debugging via TI-NSPIRE 8250 UART" |
367 | depends on ARCH_NSPIRE | 371 | depends on ARCH_NSPIRE |
372 | select DEBUG_UART_8250 | ||
368 | help | 373 | help |
369 | Say Y here if you want kernel low-level debugging support | 374 | Say Y here if you want kernel low-level debugging support |
370 | on TI-NSPIRE classic models. | 375 | on TI-NSPIRE classic models. |
@@ -453,6 +458,7 @@ choice | |||
453 | config DEBUG_PXA_UART1 | 458 | config DEBUG_PXA_UART1 |
454 | depends on ARCH_PXA | 459 | depends on ARCH_PXA |
455 | bool "Use PXA UART1 for low-level debug" | 460 | bool "Use PXA UART1 for low-level debug" |
461 | select DEBUG_UART_8250 | ||
456 | help | 462 | help |
457 | Say Y here if you want kernel low-level debugging support | 463 | Say Y here if you want kernel low-level debugging support |
458 | on PXA UART1. | 464 | on PXA UART1. |
@@ -477,6 +483,7 @@ choice | |||
477 | bool "Kernel low-level debugging messages via Rockchip RK29 UART0" | 483 | bool "Kernel low-level debugging messages via Rockchip RK29 UART0" |
478 | depends on ARCH_ROCKCHIP | 484 | depends on ARCH_ROCKCHIP |
479 | select DEBUG_ROCKCHIP_UART | 485 | select DEBUG_ROCKCHIP_UART |
486 | select DEBUG_UART_8250 | ||
480 | help | 487 | help |
481 | Say Y here if you want kernel low-level debugging support | 488 | Say Y here if you want kernel low-level debugging support |
482 | on Rockchip based platforms. | 489 | on Rockchip based platforms. |
@@ -485,6 +492,7 @@ choice | |||
485 | bool "Kernel low-level debugging messages via Rockchip RK29 UART1" | 492 | bool "Kernel low-level debugging messages via Rockchip RK29 UART1" |
486 | depends on ARCH_ROCKCHIP | 493 | depends on ARCH_ROCKCHIP |
487 | select DEBUG_ROCKCHIP_UART | 494 | select DEBUG_ROCKCHIP_UART |
495 | select DEBUG_UART_8250 | ||
488 | help | 496 | help |
489 | Say Y here if you want kernel low-level debugging support | 497 | Say Y here if you want kernel low-level debugging support |
490 | on Rockchip based platforms. | 498 | on Rockchip based platforms. |
@@ -493,6 +501,7 @@ choice | |||
493 | bool "Kernel low-level debugging messages via Rockchip RK29 UART2" | 501 | bool "Kernel low-level debugging messages via Rockchip RK29 UART2" |
494 | depends on ARCH_ROCKCHIP | 502 | depends on ARCH_ROCKCHIP |
495 | select DEBUG_ROCKCHIP_UART | 503 | select DEBUG_ROCKCHIP_UART |
504 | select DEBUG_UART_8250 | ||
496 | help | 505 | help |
497 | Say Y here if you want kernel low-level debugging support | 506 | Say Y here if you want kernel low-level debugging support |
498 | on Rockchip based platforms. | 507 | on Rockchip based platforms. |
@@ -501,6 +510,7 @@ choice | |||
501 | bool "Kernel low-level debugging messages via Rockchip RK3X UART0" | 510 | bool "Kernel low-level debugging messages via Rockchip RK3X UART0" |
502 | depends on ARCH_ROCKCHIP | 511 | depends on ARCH_ROCKCHIP |
503 | select DEBUG_ROCKCHIP_UART | 512 | select DEBUG_ROCKCHIP_UART |
513 | select DEBUG_UART_8250 | ||
504 | help | 514 | help |
505 | Say Y here if you want kernel low-level debugging support | 515 | Say Y here if you want kernel low-level debugging support |
506 | on Rockchip based platforms. | 516 | on Rockchip based platforms. |
@@ -509,6 +519,7 @@ choice | |||
509 | bool "Kernel low-level debugging messages via Rockchip RK3X UART1" | 519 | bool "Kernel low-level debugging messages via Rockchip RK3X UART1" |
510 | depends on ARCH_ROCKCHIP | 520 | depends on ARCH_ROCKCHIP |
511 | select DEBUG_ROCKCHIP_UART | 521 | select DEBUG_ROCKCHIP_UART |
522 | select DEBUG_UART_8250 | ||
512 | help | 523 | help |
513 | Say Y here if you want kernel low-level debugging support | 524 | Say Y here if you want kernel low-level debugging support |
514 | on Rockchip based platforms. | 525 | on Rockchip based platforms. |
@@ -517,6 +528,7 @@ choice | |||
517 | bool "Kernel low-level debugging messages via Rockchip RK3X UART2" | 528 | bool "Kernel low-level debugging messages via Rockchip RK3X UART2" |
518 | depends on ARCH_ROCKCHIP | 529 | depends on ARCH_ROCKCHIP |
519 | select DEBUG_ROCKCHIP_UART | 530 | select DEBUG_ROCKCHIP_UART |
531 | select DEBUG_UART_8250 | ||
520 | help | 532 | help |
521 | Say Y here if you want kernel low-level debugging support | 533 | Say Y here if you want kernel low-level debugging support |
522 | on Rockchip based platforms. | 534 | on Rockchip based platforms. |
@@ -525,6 +537,7 @@ choice | |||
525 | bool "Kernel low-level debugging messages via Rockchip RK3X UART3" | 537 | bool "Kernel low-level debugging messages via Rockchip RK3X UART3" |
526 | depends on ARCH_ROCKCHIP | 538 | depends on ARCH_ROCKCHIP |
527 | select DEBUG_ROCKCHIP_UART | 539 | select DEBUG_ROCKCHIP_UART |
540 | select DEBUG_UART_8250 | ||
528 | help | 541 | help |
529 | Say Y here if you want kernel low-level debugging support | 542 | Say Y here if you want kernel low-level debugging support |
530 | on Rockchip based platforms. | 543 | on Rockchip based platforms. |
@@ -587,6 +600,7 @@ choice | |||
587 | config DEBUG_SUNXI_UART0 | 600 | config DEBUG_SUNXI_UART0 |
588 | bool "Kernel low-level debugging messages via sunXi UART0" | 601 | bool "Kernel low-level debugging messages via sunXi UART0" |
589 | depends on ARCH_SUNXI | 602 | depends on ARCH_SUNXI |
603 | select DEBUG_UART_8250 | ||
590 | help | 604 | help |
591 | Say Y here if you want kernel low-level debugging support | 605 | Say Y here if you want kernel low-level debugging support |
592 | on Allwinner A1X based platforms on the UART0. | 606 | on Allwinner A1X based platforms on the UART0. |
@@ -594,6 +608,7 @@ choice | |||
594 | config DEBUG_SUNXI_UART1 | 608 | config DEBUG_SUNXI_UART1 |
595 | bool "Kernel low-level debugging messages via sunXi UART1" | 609 | bool "Kernel low-level debugging messages via sunXi UART1" |
596 | depends on ARCH_SUNXI | 610 | depends on ARCH_SUNXI |
611 | select DEBUG_UART_8250 | ||
597 | help | 612 | help |
598 | Say Y here if you want kernel low-level debugging support | 613 | Say Y here if you want kernel low-level debugging support |
599 | on Allwinner A1X based platforms on the UART1. | 614 | on Allwinner A1X based platforms on the UART1. |
@@ -857,8 +872,17 @@ config DEBUG_LL_INCLUDE | |||
857 | default "mach/debug-macro.S" | 872 | default "mach/debug-macro.S" |
858 | 873 | ||
859 | config DEBUG_UART_8250 | 874 | config DEBUG_UART_8250 |
860 | def_bool ARCH_EBSA110 || (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \ | 875 | def_bool ARCH_DOVE || ARCH_EBSA110 || \ |
861 | ARCH_GEMINI || ARCH_RPC | 876 | (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \ |
877 | ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \ | ||
878 | ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \ | ||
879 | ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC | ||
880 | |||
881 | config DEBUG_UART_8250_SHIFT | ||
882 | int "Register offset shift for the 8250 debug UART" | ||
883 | depends on DEBUG_UART_8250 | ||
884 | default 0 if FOOTBRIDGE || ARCH_IOP32X | ||
885 | default 2 | ||
862 | 886 | ||
863 | config DEBUG_UART_8250_FLOW_CONTROL | 887 | config DEBUG_UART_8250_FLOW_CONTROL |
864 | bool "Enable flow control for 8250 UART" | 888 | bool "Enable flow control for 8250 UART" |
diff --git a/arch/arm/include/asm/hardware/debug-8250.S b/arch/arm/include/asm/hardware/debug-8250.S index bca304576be0..a0e6e173c554 100644 --- a/arch/arm/include/asm/hardware/debug-8250.S +++ b/arch/arm/include/asm/hardware/debug-8250.S | |||
@@ -9,6 +9,10 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/serial_reg.h> | 10 | #include <linux/serial_reg.h> |
11 | 11 | ||
12 | #ifndef UART_SHIFT | ||
13 | #define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT | ||
14 | #endif | ||
15 | |||
12 | .macro senduart,rd,rx | 16 | .macro senduart,rd,rx |
13 | strb \rd, [\rx, #UART_TX << UART_SHIFT] | 17 | strb \rd, [\rx, #UART_TX << UART_SHIFT] |
14 | .endm | 18 | .endm |
diff --git a/arch/arm/include/debug/mvebu.S b/arch/arm/include/debug/mvebu.S index 6517311a1c91..0d0d82062f63 100644 --- a/arch/arm/include/debug/mvebu.S +++ b/arch/arm/include/debug/mvebu.S | |||
@@ -26,5 +26,4 @@ | |||
26 | orr \rv, \rv, #0x00012000 | 26 | orr \rv, \rv, #0x00012000 |
27 | .endm | 27 | .endm |
28 | 28 | ||
29 | #define UART_SHIFT 2 | ||
30 | #include <asm/hardware/debug-8250.S> | 29 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/include/debug/nspire.S b/arch/arm/include/debug/nspire.S index 886fd276fcbc..887463672b66 100644 --- a/arch/arm/include/debug/nspire.S +++ b/arch/arm/include/debug/nspire.S | |||
@@ -23,6 +23,5 @@ | |||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART | 25 | #ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART |
26 | #define UART_SHIFT 2 | ||
27 | #include <asm/hardware/debug-8250.S> | 26 | #include <asm/hardware/debug-8250.S> |
28 | #endif | 27 | #endif |
diff --git a/arch/arm/include/debug/pxa.S b/arch/arm/include/debug/pxa.S index e1e795aa3d7f..f10fba50c770 100644 --- a/arch/arm/include/debug/pxa.S +++ b/arch/arm/include/debug/pxa.S | |||
@@ -29,5 +29,4 @@ | |||
29 | ldr \rv, =PXA_UART_REG_VIRT_BASE | 29 | ldr \rv, =PXA_UART_REG_VIRT_BASE |
30 | .endm | 30 | .endm |
31 | 31 | ||
32 | #define UART_SHIFT 2 | ||
33 | #include <asm/hardware/debug-8250.S> | 32 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/include/debug/rockchip.S b/arch/arm/include/debug/rockchip.S index cfd883e69588..80ae8cadb064 100644 --- a/arch/arm/include/debug/rockchip.S +++ b/arch/arm/include/debug/rockchip.S | |||
@@ -38,5 +38,4 @@ | |||
38 | ldr \rv, =ROCKCHIP_UART_DEBUG_VIRT_BASE | 38 | ldr \rv, =ROCKCHIP_UART_DEBUG_VIRT_BASE |
39 | .endm | 39 | .endm |
40 | 40 | ||
41 | #define UART_SHIFT 2 | ||
42 | #include <asm/hardware/debug-8250.S> | 41 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S index 04eb56d5db2c..65d09816c720 100644 --- a/arch/arm/include/debug/sunxi.S +++ b/arch/arm/include/debug/sunxi.S | |||
@@ -23,5 +23,4 @@ | |||
23 | ldr \rv, =SUNXI_UART_DEBUG_VIRT_BASE | 23 | ldr \rv, =SUNXI_UART_DEBUG_VIRT_BASE |
24 | .endm | 24 | .endm |
25 | 25 | ||
26 | #define UART_SHIFT 2 | ||
27 | #include <asm/hardware/debug-8250.S> | 26 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-dove/include/mach/debug-macro.S b/arch/arm/mach-dove/include/mach/debug-macro.S index 5929cbc59161..182a6108a2e6 100644 --- a/arch/arm/mach-dove/include/mach/debug-macro.S +++ b/arch/arm/mach-dove/include/mach/debug-macro.S | |||
@@ -15,5 +15,4 @@ | |||
15 | orr \rv, \rv, #0x00012000 | 15 | orr \rv, \rv, #0x00012000 |
16 | .endm | 16 | .endm |
17 | 17 | ||
18 | #define UART_SHIFT 2 | ||
19 | #include <asm/hardware/debug-8250.S> | 18 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-ebsa110/include/mach/debug-macro.S b/arch/arm/mach-ebsa110/include/mach/debug-macro.S index 9b66e79632a9..984f0fa4812a 100644 --- a/arch/arm/mach-ebsa110/include/mach/debug-macro.S +++ b/arch/arm/mach-ebsa110/include/mach/debug-macro.S | |||
@@ -17,5 +17,4 @@ | |||
17 | mov \rp, \rv | 17 | mov \rp, \rv |
18 | .endm | 18 | .endm |
19 | 19 | ||
20 | #define UART_SHIFT 2 | ||
21 | #include <asm/hardware/debug-8250.S> | 20 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S index 18130fe99f28..a209936d6d98 100644 --- a/arch/arm/mach-footbridge/include/mach/debug-macro.S +++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S | |||
@@ -22,7 +22,6 @@ | |||
22 | orr \rp, \rp, #0x7c000000 @ physical | 22 | orr \rp, \rp, #0x7c000000 @ physical |
23 | .endm | 23 | .endm |
24 | 24 | ||
25 | #define UART_SHIFT 0 | ||
26 | #include <asm/hardware/debug-8250.S> | 25 | #include <asm/hardware/debug-8250.S> |
27 | 26 | ||
28 | #else | 27 | #else |
diff --git a/arch/arm/mach-gemini/include/mach/debug-macro.S b/arch/arm/mach-gemini/include/mach/debug-macro.S index cdee448dd34e..2d94ea46ec64 100644 --- a/arch/arm/mach-gemini/include/mach/debug-macro.S +++ b/arch/arm/mach-gemini/include/mach/debug-macro.S | |||
@@ -16,5 +16,4 @@ | |||
16 | ldr \rv, =IO_ADDRESS(GEMINI_UART_BASE) @ virtual | 16 | ldr \rv, =IO_ADDRESS(GEMINI_UART_BASE) @ virtual |
17 | .endm | 17 | .endm |
18 | 18 | ||
19 | #define UART_SHIFT 2 | ||
20 | #include <asm/hardware/debug-8250.S> | 19 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-iop13xx/include/mach/debug-macro.S b/arch/arm/mach-iop13xx/include/mach/debug-macro.S index d869a6f67e5c..4a776ca41960 100644 --- a/arch/arm/mach-iop13xx/include/mach/debug-macro.S +++ b/arch/arm/mach-iop13xx/include/mach/debug-macro.S | |||
@@ -20,5 +20,4 @@ | |||
20 | orr \rp, \rp, #0x00d80000 | 20 | orr \rp, \rp, #0x00d80000 |
21 | .endm | 21 | .endm |
22 | 22 | ||
23 | #define UART_SHIFT 2 | ||
24 | #include <asm/hardware/debug-8250.S> | 23 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-iop32x/include/mach/debug-macro.S b/arch/arm/mach-iop32x/include/mach/debug-macro.S index 363bdf90b34d..a090573f16c8 100644 --- a/arch/arm/mach-iop32x/include/mach/debug-macro.S +++ b/arch/arm/mach-iop32x/include/mach/debug-macro.S | |||
@@ -17,5 +17,4 @@ | |||
17 | mov \rv, \rp | 17 | mov \rv, \rp |
18 | .endm | 18 | .endm |
19 | 19 | ||
20 | #define UART_SHIFT 0 | ||
21 | #include <asm/hardware/debug-8250.S> | 20 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-iop33x/include/mach/debug-macro.S b/arch/arm/mach-iop33x/include/mach/debug-macro.S index 361be1f6026e..894bf7ce857e 100644 --- a/arch/arm/mach-iop33x/include/mach/debug-macro.S +++ b/arch/arm/mach-iop33x/include/mach/debug-macro.S | |||
@@ -18,5 +18,4 @@ | |||
18 | orr \rp, #0xff000000 @ physical | 18 | orr \rp, #0xff000000 @ physical |
19 | .endm | 19 | .endm |
20 | 20 | ||
21 | #define UART_SHIFT 2 | ||
22 | #include <asm/hardware/debug-8250.S> | 21 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S index ff686cbc5df4..403bd35a5468 100644 --- a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S +++ b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S | |||
@@ -22,5 +22,4 @@ | |||
22 | orr \rp, \rp, #0xc8000000 @ physical | 22 | orr \rp, \rp, #0xc8000000 @ physical |
23 | .endm | 23 | .endm |
24 | 24 | ||
25 | #define UART_SHIFT 2 | ||
26 | #include <asm/hardware/debug-8250.S> | 25 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S index f785d401a607..51eee02ab5e0 100644 --- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/debug-macro.S | |||
@@ -15,5 +15,4 @@ | |||
15 | orr \rv, \rv, #0x00012000 | 15 | orr \rv, \rv, #0x00012000 |
16 | .endm | 16 | .endm |
17 | 17 | ||
18 | #define UART_SHIFT 2 | ||
19 | #include <asm/hardware/debug-8250.S> | 18 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S b/arch/arm/mach-lpc32xx/include/mach/debug-macro.S index 351bd6c84909..11f986eb471c 100644 --- a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S +++ b/arch/arm/mach-lpc32xx/include/mach/debug-macro.S | |||
@@ -25,5 +25,4 @@ | |||
25 | ldrne \rv, =0xF4090000 | 25 | ldrne \rv, =0xF4090000 |
26 | .endm | 26 | .endm |
27 | 27 | ||
28 | #define UART_SHIFT 2 | ||
29 | #include <asm/hardware/debug-8250.S> | 28 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S index a7df02b049b7..0fce467ede13 100644 --- a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S +++ b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S | |||
@@ -15,5 +15,4 @@ | |||
15 | orr \rv, \rv, #0x00012000 | 15 | orr \rv, \rv, #0x00012000 |
16 | .endm | 16 | .endm |
17 | 17 | ||
18 | #define UART_SHIFT 2 | ||
19 | #include <asm/hardware/debug-8250.S> | 18 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-orion5x/include/mach/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S index f340ed8f8dd0..52f29ef747b2 100644 --- a/arch/arm/mach-orion5x/include/mach/debug-macro.S +++ b/arch/arm/mach-orion5x/include/mach/debug-macro.S | |||
@@ -17,5 +17,4 @@ | |||
17 | orr \rv, \rv, #0x00012000 | 17 | orr \rv, \rv, #0x00012000 |
18 | .endm | 18 | .endm |
19 | 19 | ||
20 | #define UART_SHIFT 2 | ||
21 | #include <asm/hardware/debug-8250.S> | 20 | #include <asm/hardware/debug-8250.S> |
diff --git a/arch/arm/mach-rpc/include/mach/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S index a92753d0daeb..fcb545083547 100644 --- a/arch/arm/mach-rpc/include/mach/debug-macro.S +++ b/arch/arm/mach-rpc/include/mach/debug-macro.S | |||
@@ -18,5 +18,4 @@ | |||
18 | orr \rp, \rp, #0x03000000 @ physical | 18 | orr \rp, \rp, #0x03000000 @ physical |
19 | .endm | 19 | .endm |
20 | 20 | ||
21 | #define UART_SHIFT 2 | ||
22 | #include <asm/hardware/debug-8250.S> | 21 | #include <asm/hardware/debug-8250.S> |