We want to use generic 8250 debug_ll code to get DEBUG_UNCOMPRESS working and to simplify the code. The old debug_ll code is no longer needed and the machine ID based detection is no longer used. Note that for most part there's no need to keep DEBUG_LL enabled. We now have CONFIG_SERIAL_EARLYCON working very early as long as the kernel cmdline has "earlycon" in it and the board specific dts file has chosen configured with with the port using stdout-path.
Unified · Split
| @@ -664,7 +664,7 @@ choice · 663 unmodified lines | ||
| 664 | 664 | config DEBUG_OMAP3UART3 |
| 665 | 665 | bool "Kernel low-level debugging messages via OMAP3 UART3 (most omap3 boards)" |
| 666 | 666 | depends on ARCH_OMAP2PLUS |
| 667 | − select DEBUG_OMAP2PLUS_UART | |
| 667 | + select DEBUG_UART_8250 | |
| 668 | 668 | help |
| 669 | 669 | This covers at least cm_t3x, beagle, crane, devkit8000, |
| 670 | 670 | igep00x0, ldp, n900, n9(50), pandora, overo, touchbook, |
| @@ -673,17 +673,17 @@ choice · 2 unmodified lines | ||
| 673 | 673 | config DEBUG_OMAP4UART3 |
| 674 | 674 | bool "Kernel low-level debugging messages via OMAP4/5 UART3 (omap4 blaze, panda, omap5 sevm)" |
| 675 | 675 | depends on ARCH_OMAP2PLUS |
| 676 | − select DEBUG_OMAP2PLUS_UART | |
| 676 | + select DEBUG_UART_8250 | |
| 677 | 677 | |
| 678 | 678 | config DEBUG_OMAP3UART4 |
| 679 | 679 | bool "Kernel low-level debugging messages via OMAP36XX UART4" |
| 680 | 680 | depends on ARCH_OMAP2PLUS |
| 681 | − select DEBUG_OMAP2PLUS_UART | |
| 681 | + select DEBUG_UART_8250 | |
| 682 | 682 | |
| 683 | 683 | config DEBUG_OMAP4UART4 |
| 684 | 684 | bool "Kernel low-level debugging messages via OMAP4/5 UART4" |
| 685 | 685 | depends on ARCH_OMAP2PLUS |
| 686 | − select DEBUG_OMAP2PLUS_UART | |
| 686 | + select DEBUG_UART_8250 | |
| 687 | 687 | |
| 688 | 688 | config DEBUG_OMAP7XXUART1 |
| 689 | 689 | bool "Kernel low-level debugging via OMAP730 UART1" |
| @@ -1523,11 +1523,14 @@ config DEBUG_UART_PHYS · 833 unmodified lines | ||
| 1523 | 1523 | default 0x40090000 if DEBUG_LPC32XX |
| 1524 | 1524 | default 0x40100000 if DEBUG_PXA_UART1 |
| 1525 | 1525 | default 0x42000000 if DEBUG_GEMINI |
| 1526 | + default 0x48020000 if DEBUG_OMAP4UART3 | |
| 1526 | 1527 | default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \ |
| 1527 | 1528 | DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1 |
| 1528 | 1529 | default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \ |
| 1529 | 1530 | DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2 |
| 1530 | − default 0x4806e000 if DEBUG_OMAP2UART3 | |
| 1531 | + default 0x4806e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4 | |
| 1532 | + default 0x49020000 if DEBUG_OMAP3UART3 | |
| 1533 | + default 0x49042000 if DEBUG_OMAP3UART4 | |
| 1531 | 1534 | default 0x50000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \ |
| 1532 | 1535 | DEBUG_S3C2410_UART0) |
| 1533 | 1536 | default 0x50004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \ |
| @@ -1646,15 +1649,18 @@ config DEBUG_UART_VIRT · 112 unmodified lines | ||
| 1646 | 1649 | default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1 |
| 1647 | 1650 | default 0xf8ffee00 if DEBUG_AT91_SAM9263_DBGU |
| 1648 | 1651 | default 0xf8fff200 if DEBUG_AT91_RM9200_DBGU |
| 1652 | + default 0xfa020000 if DEBUG_OMAP4UART3 | |
| 1649 | 1653 | default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \ |
| 1650 | 1654 | DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1 |
| 1651 | 1655 | default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \ |
| 1652 | 1656 | DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2 |
| 1653 | − default 0xfa06e000 if DEBUG_OMAP2UART3 | |
| 1657 | + default 0xfa06e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4 | |
| 1654 | 1658 | default 0xfa71e000 if DEBUG_QCOM_UARTDM |
| 1655 | 1659 | default 0xfb002000 if DEBUG_CNS3XXX |
| 1656 | 1660 | default 0xfb009000 if DEBUG_REALVIEW_STD_PORT |
| 1657 | 1661 | default 0xfb00c000 if DEBUG_AT91_SAMA5D4_USART3 |
| 1662 | + default 0xfb020000 if DEBUG_OMAP3UART3 | |
| 1663 | + default 0xfb042000 if DEBUG_OMAP3UART4 | |
| 1658 | 1664 | default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT |
| 1659 | 1665 | default 0xfc705000 if DEBUG_ZTE_ZX |
| 1660 | 1666 | default 0xfcfe8600 if DEBUG_BCM63XX_UART |
| @@ -13,14 +13,8 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/serial_reg.h> |
| 14 | 14 | |
| 15 | 15 | /* OMAP3 serial ports */ |
| 16 | −#define OMAP3_UART3_BASE 0x49020000 | |
| 17 | −#define OMAP3_UART4_BASE 0x49042000 /* Only on 36xx */ | |
| 18 | 16 | #define OMAP3_UART4_AM35XX_BASE 0x4809E000 /* Only on AM35xx */ |
| 19 | 17 | |
| 20 | −/* OMAP4 serial ports */ | |
| 21 | −#define OMAP4_UART3_BASE 0x48020000 | |
| 22 | −#define OMAP4_UART4_BASE 0x4806e000 | |
| 23 | − | |
| 24 | 18 | /* TI81XX serial ports */ |
| 25 | 19 | #define TI81XX_UART1_BASE 0x48020000 |
| 26 | 20 | #define TI81XX_UART2_BASE 0x48022000 |
| @@ -32,12 +26,6 @@ · 5 unmodified lines | ||
| 32 | 26 | /* AM33XX serial port */ |
| 33 | 27 | #define AM33XX_UART1_BASE 0x44E09000 |
| 34 | 28 | |
| 35 | −/* OMAP5 serial ports */ | |
| 36 | −#define OMAP5_UART3_BASE OMAP4_UART3_BASE | |
| 37 | −#define OMAP5_UART4_BASE OMAP4_UART4_BASE | |
| 38 | −#define OMAP5_UART5_BASE 0x48066000 | |
| 39 | −#define OMAP5_UART6_BASE 0x48068000 | |
| 40 | − | |
| 41 | 29 | /* External port on Zoom2/3 */ |
| 42 | 30 | #define ZOOM_UART_BASE 0x10000000 |
| 43 | 31 | #define ZOOM_UART_VIRT 0xfa400000 |
| @@ -68,26 +56,6 @@ omap_uart_lsr: .word 0 · 24 unmodified lines | ||
| 68 | 56 | bne 100f @ already configured |
| 69 | 57 | |
| 70 | 58 | /* Configure the UART offset from the phys/virt base */ |
| 71 | −#ifdef CONFIG_DEBUG_OMAP3UART3 | |
| 72 | − mov \rp, #UART_OFFSET(OMAP3_UART1_BASE) | |
| 73 | − add \rp, \rp, #0x00fb0000 | |
| 74 | − add \rp, \rp, #0x00006000 @ OMAP3_UART3_BASE | |
| 75 | − b 98f | |
| 76 | −#endif | |
| 77 | −#ifdef CONFIG_DEBUG_OMAP4UART3 | |
| 78 | − mov \rp, #UART_OFFSET(OMAP4_UART3_BASE) | |
| 79 | − b 98f | |
| 80 | −#endif | |
| 81 | −#ifdef CONFIG_DEBUG_OMAP3UART4 | |
| 82 | − mov \rp, #UART_OFFSET(OMAP3_UART1_BASE) | |
| 83 | − add \rp, \rp, #0x00fb0000 | |
| 84 | − add \rp, \rp, #0x00028000 @ OMAP3_UART4_BASE | |
| 85 | − b 98f | |
| 86 | −#endif | |
| 87 | −#ifdef CONFIG_DEBUG_OMAP4UART4 | |
| 88 | − mov \rp, #UART_OFFSET(OMAP4_UART4_BASE) | |
| 89 | − b 98f | |
| 90 | −#endif | |
| 91 | 59 | #ifdef CONFIG_DEBUG_TI81XXUART1 |
| 92 | 60 | mov \rp, #UART_OFFSET(TI81XX_UART1_BASE) |
| 93 | 61 | b 98f |