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.
Showing the changes to arch/arm/include/debug (1 of 2 files). Show all
Unified · Split
| @@ -13,14 +13,8 @@ · 12 unmodified lines | |||
| 13 | #include <linux/serial_reg.h> | 13 | #include <linux/serial_reg.h> |
| 14 | 14 | ||
| 15 | /* OMAP3 serial ports */ | 15 | /* OMAP3 serial ports */ |
| 16 | #define OMAP3_UART3_BASE 0x49020000 | ||
| 17 | #define OMAP3_UART4_BASE 0x49042000 /* Only on 36xx */ | ||
| 18 | #define OMAP3_UART4_AM35XX_BASE 0x4809E000 /* Only on AM35xx */ | 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 | /* TI81XX serial ports */ | 18 | /* TI81XX serial ports */ |
| 25 | #define TI81XX_UART1_BASE 0x48020000 | 19 | #define TI81XX_UART1_BASE 0x48020000 |
| 26 | #define TI81XX_UART2_BASE 0x48022000 | 20 | #define TI81XX_UART2_BASE 0x48022000 |
| @@ -32,12 +26,6 @@ · 5 unmodified lines | |||
| 32 | /* AM33XX serial port */ | 26 | /* AM33XX serial port */ |
| 33 | #define AM33XX_UART1_BASE 0x44E09000 | 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 | /* External port on Zoom2/3 */ | 29 | /* External port on Zoom2/3 */ |
| 42 | #define ZOOM_UART_BASE 0x10000000 | 30 | #define ZOOM_UART_BASE 0x10000000 |
| 43 | #define ZOOM_UART_VIRT 0xfa400000 | 31 | #define ZOOM_UART_VIRT 0xfa400000 |
| @@ -68,26 +56,6 @@ omap_uart_lsr: .word 0 · 24 unmodified lines | |||
| 68 | bne 100f @ already configured | 56 | bne 100f @ already configured |
| 69 | 57 | ||
| 70 | /* Configure the UART offset from the phys/virt base */ | 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 | #ifdef CONFIG_DEBUG_TI81XXUART1 | 59 | #ifdef CONFIG_DEBUG_TI81XXUART1 |
| 92 | mov \rp, #UART_OFFSET(TI81XX_UART1_BASE) | 60 | mov \rp, #UART_OFFSET(TI81XX_UART1_BASE) |
| 93 | b 98f | 61 | b 98f |