[PATCH] Serial: Split 8250 port table (part 2)

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

[PATCH] Serial: Split 8250 port table (part 2)

Remove legacy ISA serial ports for Accent, Boca, Fourport, Hub6 and MCA
from the architecture specific serial.h include.

The only ports which remain in asm-*/serial.h are the platform specific
entries. These should really be converted by platform maintainers to
use a platform device, such as can be found in
arch/arm/mach-footbridge/isa.c

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by

Russell King 21 years ago 026d02a2 e763b90c

+20 -519

19 changed files

expand all collapse all

arch

parisc

configs

712_defconfig

a500_defconfig

b180_defconfig

c3000_defconfig

defconfig

drivers

serial

8250.c

Kconfig

include

asm-alpha

serial.h

asm-arm26

serial.h

asm-i386

serial.h

asm-m68k

serial.h

asm-mips

serial.h

asm-parisc

serial.h

asm-ppc

pc_serial.h

asm-sh

bigsur

serial.h

ec3104

serial.h

asm-sh64

serial.h

asm-x86_64

serial.h

+1 -1

arch/parisc/configs/712_defconfig

reviewed

··· 506 506 # 507 507 CONFIG_SERIAL_8250=y 508 508 CONFIG_SERIAL_8250_CONSOLE=y 509 509 - CONFIG_SERIAL_8250_NR_UARTS=8 509 509 + CONFIG_SERIAL_8250_NR_UARTS=17 510 510 CONFIG_SERIAL_8250_EXTENDED=y 511 511 CONFIG_SERIAL_8250_MANY_PORTS=y 512 512 CONFIG_SERIAL_8250_SHARE_IRQ=y

+1 -1

arch/parisc/configs/a500_defconfig

reviewed

··· 662 662 CONFIG_SERIAL_8250=y 663 663 CONFIG_SERIAL_8250_CONSOLE=y 664 664 CONFIG_SERIAL_8250_CS=m 665 665 - CONFIG_SERIAL_8250_NR_UARTS=8 665 665 + CONFIG_SERIAL_8250_NR_UARTS=17 666 666 CONFIG_SERIAL_8250_EXTENDED=y 667 667 CONFIG_SERIAL_8250_MANY_PORTS=y 668 668 CONFIG_SERIAL_8250_SHARE_IRQ=y

+1 -1

arch/parisc/configs/b180_defconfig

reviewed

··· 514 514 # 515 515 CONFIG_SERIAL_8250=y 516 516 CONFIG_SERIAL_8250_CONSOLE=y 517 517 - CONFIG_SERIAL_8250_NR_UARTS=4 517 517 + CONFIG_SERIAL_8250_NR_UARTS=13 518 518 CONFIG_SERIAL_8250_EXTENDED=y 519 519 CONFIG_SERIAL_8250_MANY_PORTS=y 520 520 CONFIG_SERIAL_8250_SHARE_IRQ=y

+1 -1

arch/parisc/configs/c3000_defconfig

reviewed

··· 661 661 # 662 662 CONFIG_SERIAL_8250=y 663 663 CONFIG_SERIAL_8250_CONSOLE=y 664 664 - CONFIG_SERIAL_8250_NR_UARTS=4 664 664 + CONFIG_SERIAL_8250_NR_UARTS=13 665 665 CONFIG_SERIAL_8250_EXTENDED=y 666 666 CONFIG_SERIAL_8250_MANY_PORTS=y 667 667 CONFIG_SERIAL_8250_SHARE_IRQ=y

+1 -1

arch/parisc/defconfig

reviewed

··· 517 517 # 518 518 CONFIG_SERIAL_8250=y 519 519 CONFIG_SERIAL_8250_CONSOLE=y 520 520 - CONFIG_SERIAL_8250_NR_UARTS=4 520 520 + CONFIG_SERIAL_8250_NR_UARTS=13 521 521 CONFIG_SERIAL_8250_EXTENDED=y 522 522 CONFIG_SERIAL_8250_MANY_PORTS=y 523 523 CONFIG_SERIAL_8250_SHARE_IRQ=y

+1 -1

drivers/serial/8250.c

reviewed

··· 105 105 SERIAL_PORT_DFNS /* defined in asm/serial.h */ 106 106 }; 107 107 108 108 - #define UART_NR (ARRAY_SIZE(old_serial_port) + CONFIG_SERIAL_8250_NR_UARTS) 108 108 + #define UART_NR CONFIG_SERIAL_8250_NR_UARTS 109 109 110 110 #ifdef CONFIG_SERIAL_8250_RSA 111 111

+1 -1

drivers/serial/Kconfig

reviewed

··· 86 86 namespace, say Y here. If unsure, say N. 87 87 88 88 config SERIAL_8250_NR_UARTS 89 89 - int "Maximum number of non-legacy 8250/16550 serial ports" 89 89 + int "Maximum number of 8250/16550 serial ports" 90 90 depends on SERIAL_8250 91 91 default "4" 92 92 help

+1 -46

include/asm-alpha/serial.h

reviewed

··· 22 22 #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF 23 23 #endif 24 24 25 25 - #ifdef CONFIG_SERIAL_MANY_PORTS 26 26 - #define FOURPORT_FLAGS ASYNC_FOURPORT 27 27 - #define ACCENT_FLAGS 0 28 28 - #define BOCA_FLAGS 0 29 29 - #endif 30 30 - 31 31 - #define STD_SERIAL_PORT_DEFNS \ 25 25 + #define SERIAL_PORT_DFNS \ 32 26 /* UART CLK PORT IRQ FLAGS */ \ 33 27 { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ 34 28 { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ 35 29 { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ 36 30 { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ 37 37 - 38 38 - 39 39 - #ifdef CONFIG_SERIAL_MANY_PORTS 40 40 - #define EXTRA_SERIAL_PORT_DEFNS \ 41 41 - { 0, BASE_BAUD, 0x1A0, 9, FOURPORT_FLAGS }, /* ttyS4 */ \ 42 42 - { 0, BASE_BAUD, 0x1A8, 9, FOURPORT_FLAGS }, /* ttyS5 */ \ 43 43 - { 0, BASE_BAUD, 0x1B0, 9, FOURPORT_FLAGS }, /* ttyS6 */ \ 44 44 - { 0, BASE_BAUD, 0x1B8, 9, FOURPORT_FLAGS }, /* ttyS7 */ \ 45 45 - { 0, BASE_BAUD, 0x2A0, 5, FOURPORT_FLAGS }, /* ttyS8 */ \ 46 46 - { 0, BASE_BAUD, 0x2A8, 5, FOURPORT_FLAGS }, /* ttyS9 */ \ 47 47 - { 0, BASE_BAUD, 0x2B0, 5, FOURPORT_FLAGS }, /* ttyS10 */ \ 48 48 - { 0, BASE_BAUD, 0x2B8, 5, FOURPORT_FLAGS }, /* ttyS11 */ \ 49 49 - { 0, BASE_BAUD, 0x330, 4, ACCENT_FLAGS }, /* ttyS12 */ \ 50 50 - { 0, BASE_BAUD, 0x338, 4, ACCENT_FLAGS }, /* ttyS13 */ \ 51 51 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS14 (spare) */ \ 52 52 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS15 (spare) */ \ 53 53 - { 0, BASE_BAUD, 0x100, 12, BOCA_FLAGS }, /* ttyS16 */ \ 54 54 - { 0, BASE_BAUD, 0x108, 12, BOCA_FLAGS }, /* ttyS17 */ \ 55 55 - { 0, BASE_BAUD, 0x110, 12, BOCA_FLAGS }, /* ttyS18 */ \ 56 56 - { 0, BASE_BAUD, 0x118, 12, BOCA_FLAGS }, /* ttyS19 */ \ 57 57 - { 0, BASE_BAUD, 0x120, 12, BOCA_FLAGS }, /* ttyS20 */ \ 58 58 - { 0, BASE_BAUD, 0x128, 12, BOCA_FLAGS }, /* ttyS21 */ \ 59 59 - { 0, BASE_BAUD, 0x130, 12, BOCA_FLAGS }, /* ttyS22 */ \ 60 60 - { 0, BASE_BAUD, 0x138, 12, BOCA_FLAGS }, /* ttyS23 */ \ 61 61 - { 0, BASE_BAUD, 0x140, 12, BOCA_FLAGS }, /* ttyS24 */ \ 62 62 - { 0, BASE_BAUD, 0x148, 12, BOCA_FLAGS }, /* ttyS25 */ \ 63 63 - { 0, BASE_BAUD, 0x150, 12, BOCA_FLAGS }, /* ttyS26 */ \ 64 64 - { 0, BASE_BAUD, 0x158, 12, BOCA_FLAGS }, /* ttyS27 */ \ 65 65 - { 0, BASE_BAUD, 0x160, 12, BOCA_FLAGS }, /* ttyS28 */ \ 66 66 - { 0, BASE_BAUD, 0x168, 12, BOCA_FLAGS }, /* ttyS29 */ \ 67 67 - { 0, BASE_BAUD, 0x170, 12, BOCA_FLAGS }, /* ttyS30 */ \ 68 68 - { 0, BASE_BAUD, 0x178, 12, BOCA_FLAGS }, /* ttyS31 */ 69 69 - #else 70 70 - #define EXTRA_SERIAL_PORT_DEFNS 71 71 - #endif 72 72 - 73 73 - #define SERIAL_PORT_DFNS \ 74 74 - STD_SERIAL_PORT_DEFNS \ 75 75 - EXTRA_SERIAL_PORT_DEFNS

+2 -20

include/asm-arm26/serial.h

reviewed

··· 30 30 #if defined(CONFIG_ARCH_A5K) 31 31 /* UART CLK PORT IRQ FLAGS */ 32 32 33 33 - #define STD_SERIAL_PORT_DEFNS \ 33 33 + #define SERIAL_PORT_DFNS \ 34 34 { 0, BASE_BAUD, 0x3F8, 10, STD_COM_FLAGS }, /* ttyS0 */ \ 35 35 { 0, BASE_BAUD, 0x2F8, 10, STD_COM_FLAGS }, /* ttyS1 */ 36 36 37 37 #else 38 38 39 39 - #define STD_SERIAL_PORT_DEFNS \ 39 39 + #define SERIAL_PORT_DFNS \ 40 40 { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS0 */ \ 41 41 { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS1 */ 42 42 43 43 #endif 44 44 - 45 45 - #define EXTRA_SERIAL_PORT_DEFNS \ 46 46 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS2 */ \ 47 47 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS3 */ \ 48 48 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS4 */ \ 49 49 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS5 */ \ 50 50 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS6 */ \ 51 51 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS7 */ \ 52 52 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS8 */ \ 53 53 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS9 */ \ 54 54 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS10 */ \ 55 55 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS11 */ \ 56 56 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS12 */ \ 57 57 - { 0, BASE_BAUD, 0 , 0, STD_COM_FLAGS }, /* ttyS13 */ 58 58 - 59 59 - #define SERIAL_PORT_DFNS \ 60 60 - STD_SERIAL_PORT_DEFNS \ 61 61 - EXTRA_SERIAL_PORT_DEFNS 62 44 63 45 #endif

+1 -101

include/asm-i386/serial.h

reviewed

··· 22 22 #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF 23 23 #endif 24 24 25 25 - #ifdef CONFIG_SERIAL_MANY_PORTS 26 26 - #define FOURPORT_FLAGS ASYNC_FOURPORT 27 27 - #define ACCENT_FLAGS 0 28 28 - #define BOCA_FLAGS 0 29 29 - #define HUB6_FLAGS 0 30 30 - #endif 31 31 - 32 32 - #define MCA_COM_FLAGS (STD_COM_FLAGS|ASYNC_BOOT_ONLYMCA) 33 33 - 34 34 - /* 35 35 - * The following define the access methods for the HUB6 card. All 36 36 - * access is through two ports for all 24 possible chips. The card is 37 37 - * selected through the high 2 bits, the port on that card with the 38 38 - * "middle" 3 bits, and the register on that port with the bottom 39 39 - * 3 bits. 40 40 - * 41 41 - * While the access port and interrupt is configurable, the default 42 42 - * port locations are 0x302 for the port control register, and 0x303 43 43 - * for the data read/write register. Normally, the interrupt is at irq3 44 44 - * but can be anything from 3 to 7 inclusive. Note that using 3 will 45 45 - * require disabling com2. 46 46 - */ 47 47 - 48 48 - #define C_P(card,port) (((card)<<6|(port)<<3) + 1) 49 49 - 50 50 - #define STD_SERIAL_PORT_DEFNS \ 25 25 + #define SERIAL_PORT_DFNS \ 51 26 /* UART CLK PORT IRQ FLAGS */ \ 52 27 { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ 53 28 { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ 54 29 { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ 55 30 { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ 56 56 - 57 57 - 58 58 - #ifdef CONFIG_SERIAL_MANY_PORTS 59 59 - #define EXTRA_SERIAL_PORT_DEFNS \ 60 60 - { 0, BASE_BAUD, 0x1A0, 9, FOURPORT_FLAGS }, /* ttyS4 */ \ 61 61 - { 0, BASE_BAUD, 0x1A8, 9, FOURPORT_FLAGS }, /* ttyS5 */ \ 62 62 - { 0, BASE_BAUD, 0x1B0, 9, FOURPORT_FLAGS }, /* ttyS6 */ \ 63 63 - { 0, BASE_BAUD, 0x1B8, 9, FOURPORT_FLAGS }, /* ttyS7 */ \ 64 64 - { 0, BASE_BAUD, 0x2A0, 5, FOURPORT_FLAGS }, /* ttyS8 */ \ 65 65 - { 0, BASE_BAUD, 0x2A8, 5, FOURPORT_FLAGS }, /* ttyS9 */ \ 66 66 - { 0, BASE_BAUD, 0x2B0, 5, FOURPORT_FLAGS }, /* ttyS10 */ \ 67 67 - { 0, BASE_BAUD, 0x2B8, 5, FOURPORT_FLAGS }, /* ttyS11 */ \ 68 68 - { 0, BASE_BAUD, 0x330, 4, ACCENT_FLAGS }, /* ttyS12 */ \ 69 69 - { 0, BASE_BAUD, 0x338, 4, ACCENT_FLAGS }, /* ttyS13 */ \ 70 70 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS14 (spare) */ \ 71 71 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS15 (spare) */ \ 72 72 - { 0, BASE_BAUD, 0x100, 12, BOCA_FLAGS }, /* ttyS16 */ \ 73 73 - { 0, BASE_BAUD, 0x108, 12, BOCA_FLAGS }, /* ttyS17 */ \ 74 74 - { 0, BASE_BAUD, 0x110, 12, BOCA_FLAGS }, /* ttyS18 */ \ 75 75 - { 0, BASE_BAUD, 0x118, 12, BOCA_FLAGS }, /* ttyS19 */ \ 76 76 - { 0, BASE_BAUD, 0x120, 12, BOCA_FLAGS }, /* ttyS20 */ \ 77 77 - { 0, BASE_BAUD, 0x128, 12, BOCA_FLAGS }, /* ttyS21 */ \ 78 78 - { 0, BASE_BAUD, 0x130, 12, BOCA_FLAGS }, /* ttyS22 */ \ 79 79 - { 0, BASE_BAUD, 0x138, 12, BOCA_FLAGS }, /* ttyS23 */ \ 80 80 - { 0, BASE_BAUD, 0x140, 12, BOCA_FLAGS }, /* ttyS24 */ \ 81 81 - { 0, BASE_BAUD, 0x148, 12, BOCA_FLAGS }, /* ttyS25 */ \ 82 82 - { 0, BASE_BAUD, 0x150, 12, BOCA_FLAGS }, /* ttyS26 */ \ 83 83 - { 0, BASE_BAUD, 0x158, 12, BOCA_FLAGS }, /* ttyS27 */ \ 84 84 - { 0, BASE_BAUD, 0x160, 12, BOCA_FLAGS }, /* ttyS28 */ \ 85 85 - { 0, BASE_BAUD, 0x168, 12, BOCA_FLAGS }, /* ttyS29 */ \ 86 86 - { 0, BASE_BAUD, 0x170, 12, BOCA_FLAGS }, /* ttyS30 */ \ 87 87 - { 0, BASE_BAUD, 0x178, 12, BOCA_FLAGS }, /* ttyS31 */ 88 88 - #else 89 89 - #define EXTRA_SERIAL_PORT_DEFNS 90 90 - #endif 91 91 - 92 92 - /* You can have up to four HUB6's in the system, but I've only 93 93 - * included two cards here for a total of twelve ports. 94 94 - */ 95 95 - #if (defined(CONFIG_HUB6) && defined(CONFIG_SERIAL_MANY_PORTS)) 96 96 - #define HUB6_SERIAL_PORT_DFNS \ 97 97 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,0) }, /* ttyS32 */ \ 98 98 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,1) }, /* ttyS33 */ \ 99 99 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,2) }, /* ttyS34 */ \ 100 100 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,3) }, /* ttyS35 */ \ 101 101 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,4) }, /* ttyS36 */ \ 102 102 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,5) }, /* ttyS37 */ \ 103 103 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,0) }, /* ttyS38 */ \ 104 104 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,1) }, /* ttyS39 */ \ 105 105 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,2) }, /* ttyS40 */ \ 106 106 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,3) }, /* ttyS41 */ \ 107 107 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,4) }, /* ttyS42 */ \ 108 108 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,5) }, /* ttyS43 */ 109 109 - #else 110 110 - #define HUB6_SERIAL_PORT_DFNS 111 111 - #endif 112 112 - 113 113 - #ifdef CONFIG_MCA 114 114 - #define MCA_SERIAL_PORT_DFNS \ 115 115 - { 0, BASE_BAUD, 0x3220, 3, MCA_COM_FLAGS }, \ 116 116 - { 0, BASE_BAUD, 0x3228, 3, MCA_COM_FLAGS }, \ 117 117 - { 0, BASE_BAUD, 0x4220, 3, MCA_COM_FLAGS }, \ 118 118 - { 0, BASE_BAUD, 0x4228, 3, MCA_COM_FLAGS }, \ 119 119 - { 0, BASE_BAUD, 0x5220, 3, MCA_COM_FLAGS }, \ 120 120 - { 0, BASE_BAUD, 0x5228, 3, MCA_COM_FLAGS }, 121 121 - #else 122 122 - #define MCA_SERIAL_PORT_DFNS 123 123 - #endif 124 124 - 125 125 - #define SERIAL_PORT_DFNS \ 126 126 - STD_SERIAL_PORT_DEFNS \ 127 127 - EXTRA_SERIAL_PORT_DEFNS \ 128 128 - HUB6_SERIAL_PORT_DFNS \ 129 129 - MCA_SERIAL_PORT_DFNS 130 130 -

+1 -46

include/asm-m68k/serial.h

reviewed

··· 26 26 #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF 27 27 #endif 28 28 29 29 - #ifdef CONFIG_SERIAL_MANY_PORTS 30 30 - #define FOURPORT_FLAGS ASYNC_FOURPORT 31 31 - #define ACCENT_FLAGS 0 32 32 - #define BOCA_FLAGS 0 33 33 - #endif 34 34 - 35 35 - #define STD_SERIAL_PORT_DEFNS \ 29 29 + #define SERIAL_PORT_DFNS \ 36 30 /* UART CLK PORT IRQ FLAGS */ \ 37 31 { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ 38 32 { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ 39 33 { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ 40 34 { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ 41 41 - 42 42 - 43 43 - #ifdef CONFIG_SERIAL_MANY_PORTS 44 44 - #define EXTRA_SERIAL_PORT_DEFNS \ 45 45 - { 0, BASE_BAUD, 0x1A0, 9, FOURPORT_FLAGS }, /* ttyS4 */ \ 46 46 - { 0, BASE_BAUD, 0x1A8, 9, FOURPORT_FLAGS }, /* ttyS5 */ \ 47 47 - { 0, BASE_BAUD, 0x1B0, 9, FOURPORT_FLAGS }, /* ttyS6 */ \ 48 48 - { 0, BASE_BAUD, 0x1B8, 9, FOURPORT_FLAGS }, /* ttyS7 */ \ 49 49 - { 0, BASE_BAUD, 0x2A0, 5, FOURPORT_FLAGS }, /* ttyS8 */ \ 50 50 - { 0, BASE_BAUD, 0x2A8, 5, FOURPORT_FLAGS }, /* ttyS9 */ \ 51 51 - { 0, BASE_BAUD, 0x2B0, 5, FOURPORT_FLAGS }, /* ttyS10 */ \ 52 52 - { 0, BASE_BAUD, 0x2B8, 5, FOURPORT_FLAGS }, /* ttyS11 */ \ 53 53 - { 0, BASE_BAUD, 0x330, 4, ACCENT_FLAGS }, /* ttyS12 */ \ 54 54 - { 0, BASE_BAUD, 0x338, 4, ACCENT_FLAGS }, /* ttyS13 */ \ 55 55 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS14 (spare) */ \ 56 56 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS15 (spare) */ \ 57 57 - { 0, BASE_BAUD, 0x100, 12, BOCA_FLAGS }, /* ttyS16 */ \ 58 58 - { 0, BASE_BAUD, 0x108, 12, BOCA_FLAGS }, /* ttyS17 */ \ 59 59 - { 0, BASE_BAUD, 0x110, 12, BOCA_FLAGS }, /* ttyS18 */ \ 60 60 - { 0, BASE_BAUD, 0x118, 12, BOCA_FLAGS }, /* ttyS19 */ \ 61 61 - { 0, BASE_BAUD, 0x120, 12, BOCA_FLAGS }, /* ttyS20 */ \ 62 62 - { 0, BASE_BAUD, 0x128, 12, BOCA_FLAGS }, /* ttyS21 */ \ 63 63 - { 0, BASE_BAUD, 0x130, 12, BOCA_FLAGS }, /* ttyS22 */ \ 64 64 - { 0, BASE_BAUD, 0x138, 12, BOCA_FLAGS }, /* ttyS23 */ \ 65 65 - { 0, BASE_BAUD, 0x140, 12, BOCA_FLAGS }, /* ttyS24 */ \ 66 66 - { 0, BASE_BAUD, 0x148, 12, BOCA_FLAGS }, /* ttyS25 */ \ 67 67 - { 0, BASE_BAUD, 0x150, 12, BOCA_FLAGS }, /* ttyS26 */ \ 68 68 - { 0, BASE_BAUD, 0x158, 12, BOCA_FLAGS }, /* ttyS27 */ \ 69 69 - { 0, BASE_BAUD, 0x160, 12, BOCA_FLAGS }, /* ttyS28 */ \ 70 70 - { 0, BASE_BAUD, 0x168, 12, BOCA_FLAGS }, /* ttyS29 */ \ 71 71 - { 0, BASE_BAUD, 0x170, 12, BOCA_FLAGS }, /* ttyS30 */ \ 72 72 - { 0, BASE_BAUD, 0x178, 12, BOCA_FLAGS }, /* ttyS31 */ 73 73 - #else 74 74 - #define EXTRA_SERIAL_PORT_DEFNS 75 75 - #endif 76 76 - 77 77 - #define SERIAL_PORT_DFNS \ 78 78 - STD_SERIAL_PORT_DEFNS \ 79 79 - EXTRA_SERIAL_PORT_DEFNS

-84

include/asm-mips/serial.h

reviewed

··· 29 29 #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF 30 30 #endif 31 31 32 32 - #ifdef CONFIG_SERIAL_MANY_PORTS 33 33 - #define FOURPORT_FLAGS ASYNC_FOURPORT 34 34 - #define ACCENT_FLAGS 0 35 35 - #define BOCA_FLAGS 0 36 36 - #define HUB6_FLAGS 0 37 37 - #define RS_TABLE_SIZE 64 38 38 - #else 39 39 - #define RS_TABLE_SIZE 40 40 - #endif 41 41 - 42 42 - /* 43 43 - * The following define the access methods for the HUB6 card. All 44 44 - * access is through two ports for all 24 possible chips. The card is 45 45 - * selected through the high 2 bits, the port on that card with the 46 46 - * "middle" 3 bits, and the register on that port with the bottom 47 47 - * 3 bits. 48 48 - * 49 49 - * While the access port and interrupt is configurable, the default 50 50 - * port locations are 0x302 for the port control register, and 0x303 51 51 - * for the data read/write register. Normally, the interrupt is at irq3 52 52 - * but can be anything from 3 to 7 inclusive. Note that using 3 will 53 53 - * require disabling com2. 54 54 - */ 55 55 - 56 56 - #define C_P(card,port) (((card)<<6|(port)<<3) + 1) 57 57 - 58 32 #ifdef CONFIG_MACH_JAZZ 59 33 #include <asm/jazz.h> 60 34 ··· 214 240 { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ 215 241 { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ 216 242 217 217 - #ifdef CONFIG_SERIAL_MANY_PORTS 218 218 - #define EXTRA_SERIAL_PORT_DEFNS \ 219 219 - { 0, BASE_BAUD, 0x1A0, 9, FOURPORT_FLAGS }, /* ttyS4 */ \ 220 220 - { 0, BASE_BAUD, 0x1A8, 9, FOURPORT_FLAGS }, /* ttyS5 */ \ 221 221 - { 0, BASE_BAUD, 0x1B0, 9, FOURPORT_FLAGS }, /* ttyS6 */ \ 222 222 - { 0, BASE_BAUD, 0x1B8, 9, FOURPORT_FLAGS }, /* ttyS7 */ \ 223 223 - { 0, BASE_BAUD, 0x2A0, 5, FOURPORT_FLAGS }, /* ttyS8 */ \ 224 224 - { 0, BASE_BAUD, 0x2A8, 5, FOURPORT_FLAGS }, /* ttyS9 */ \ 225 225 - { 0, BASE_BAUD, 0x2B0, 5, FOURPORT_FLAGS }, /* ttyS10 */ \ 226 226 - { 0, BASE_BAUD, 0x2B8, 5, FOURPORT_FLAGS }, /* ttyS11 */ \ 227 227 - { 0, BASE_BAUD, 0x330, 4, ACCENT_FLAGS }, /* ttyS12 */ \ 228 228 - { 0, BASE_BAUD, 0x338, 4, ACCENT_FLAGS }, /* ttyS13 */ \ 229 229 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS14 (spare) */ \ 230 230 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS15 (spare) */ \ 231 231 - { 0, BASE_BAUD, 0x100, 12, BOCA_FLAGS }, /* ttyS16 */ \ 232 232 - { 0, BASE_BAUD, 0x108, 12, BOCA_FLAGS }, /* ttyS17 */ \ 233 233 - { 0, BASE_BAUD, 0x110, 12, BOCA_FLAGS }, /* ttyS18 */ \ 234 234 - { 0, BASE_BAUD, 0x118, 12, BOCA_FLAGS }, /* ttyS19 */ \ 235 235 - { 0, BASE_BAUD, 0x120, 12, BOCA_FLAGS }, /* ttyS20 */ \ 236 236 - { 0, BASE_BAUD, 0x128, 12, BOCA_FLAGS }, /* ttyS21 */ \ 237 237 - { 0, BASE_BAUD, 0x130, 12, BOCA_FLAGS }, /* ttyS22 */ \ 238 238 - { 0, BASE_BAUD, 0x138, 12, BOCA_FLAGS }, /* ttyS23 */ \ 239 239 - { 0, BASE_BAUD, 0x140, 12, BOCA_FLAGS }, /* ttyS24 */ \ 240 240 - { 0, BASE_BAUD, 0x148, 12, BOCA_FLAGS }, /* ttyS25 */ \ 241 241 - { 0, BASE_BAUD, 0x150, 12, BOCA_FLAGS }, /* ttyS26 */ \ 242 242 - { 0, BASE_BAUD, 0x158, 12, BOCA_FLAGS }, /* ttyS27 */ \ 243 243 - { 0, BASE_BAUD, 0x160, 12, BOCA_FLAGS }, /* ttyS28 */ \ 244 244 - { 0, BASE_BAUD, 0x168, 12, BOCA_FLAGS }, /* ttyS29 */ \ 245 245 - { 0, BASE_BAUD, 0x170, 12, BOCA_FLAGS }, /* ttyS30 */ \ 246 246 - { 0, BASE_BAUD, 0x178, 12, BOCA_FLAGS }, /* ttyS31 */ 247 247 - #else /* CONFIG_SERIAL_MANY_PORTS */ 248 248 - #define EXTRA_SERIAL_PORT_DEFNS 249 249 - #endif /* CONFIG_SERIAL_MANY_PORTS */ 250 250 - 251 243 #else /* CONFIG_HAVE_STD_PC_SERIAL_PORTS */ 252 244 #define STD_SERIAL_PORT_DEFNS 253 253 - #define EXTRA_SERIAL_PORT_DEFNS 254 245 #endif /* CONFIG_HAVE_STD_PC_SERIAL_PORTS */ 255 255 - 256 256 - /* You can have up to four HUB6's in the system, but I've only 257 257 - * included two cards here for a total of twelve ports. 258 258 - */ 259 259 - #if (defined(CONFIG_HUB6) && defined(CONFIG_SERIAL_MANY_PORTS)) 260 260 - #define HUB6_SERIAL_PORT_DFNS \ 261 261 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,0) }, /* ttyS32 */ \ 262 262 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,1) }, /* ttyS33 */ \ 263 263 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,2) }, /* ttyS34 */ \ 264 264 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,3) }, /* ttyS35 */ \ 265 265 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,4) }, /* ttyS36 */ \ 266 266 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,5) }, /* ttyS37 */ \ 267 267 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,0) }, /* ttyS38 */ \ 268 268 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,1) }, /* ttyS39 */ \ 269 269 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,2) }, /* ttyS40 */ \ 270 270 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,3) }, /* ttyS41 */ \ 271 271 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,4) }, /* ttyS42 */ \ 272 272 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,5) }, /* ttyS43 */ 273 273 - #else 274 274 - #define HUB6_SERIAL_PORT_DFNS 275 275 - #endif 276 246 277 247 #ifdef CONFIG_MOMENCO_JAGUAR_ATX 278 248 /* Ordinary NS16552 duart with a 20MHz crystal. */ ··· 345 427 COBALT_SERIAL_PORT_DEFNS \ 346 428 DDB5477_SERIAL_PORT_DEFNS \ 347 429 EV96100_SERIAL_PORT_DEFNS \ 348 348 - EXTRA_SERIAL_PORT_DEFNS \ 349 349 - HUB6_SERIAL_PORT_DFNS \ 350 430 IP32_SERIAL_PORT_DEFNS \ 351 431 ITE_SERIAL_PORT_DEFNS \ 352 432 IVR_SERIAL_PORT_DEFNS \

+1 -15

include/asm-parisc/serial.h

reviewed

··· 19 19 * A500 w/ PCI serial cards: 5 + 4 * card ~= 17 20 20 */ 21 21 22 22 - #define STD_SERIAL_PORT_DEFNS \ 23 23 - { 0, }, /* ttyS0 */ \ 24 24 - { 0, }, /* ttyS1 */ \ 25 25 - { 0, }, /* ttyS2 */ \ 26 26 - { 0, }, /* ttyS3 */ \ 27 27 - { 0, }, /* ttyS4 */ \ 28 28 - { 0, }, /* ttyS5 */ \ 29 29 - { 0, }, /* ttyS6 */ \ 30 30 - { 0, }, /* ttyS7 */ \ 31 31 - { 0, }, /* ttyS8 */ 32 32 - 33 33 - 34 34 - #define SERIAL_PORT_DFNS \ 35 35 - STD_SERIAL_PORT_DEFNS 36 36 - 22 22 + #define SERIAL_PORT_DFNS

+1 -85

include/asm-ppc/pc_serial.h

reviewed

··· 35 35 #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF 36 36 #endif 37 37 38 38 - #ifdef CONFIG_SERIAL_MANY_PORTS 39 39 - #define FOURPORT_FLAGS ASYNC_FOURPORT 40 40 - #define ACCENT_FLAGS 0 41 41 - #define BOCA_FLAGS 0 42 42 - #define HUB6_FLAGS 0 43 43 - #endif 44 44 - 45 45 - /* 46 46 - * The following define the access methods for the HUB6 card. All 47 47 - * access is through two ports for all 24 possible chips. The card is 48 48 - * selected through the high 2 bits, the port on that card with the 49 49 - * "middle" 3 bits, and the register on that port with the bottom 50 50 - * 3 bits. 51 51 - * 52 52 - * While the access port and interrupt is configurable, the default 53 53 - * port locations are 0x302 for the port control register, and 0x303 54 54 - * for the data read/write register. Normally, the interrupt is at irq3 55 55 - * but can be anything from 3 to 7 inclusive. Note that using 3 will 56 56 - * require disabling com2. 57 57 - */ 58 58 - 59 59 - #define C_P(card,port) (((card)<<6|(port)<<3) + 1) 60 60 - 61 61 - #define STD_SERIAL_PORT_DEFNS \ 38 38 + #define SERIAL_PORT_DFNS \ 62 39 /* UART CLK PORT IRQ FLAGS */ \ 63 40 { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ 64 41 { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ 65 42 { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ 66 43 { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ 67 67 - 68 68 - 69 69 - #ifdef CONFIG_SERIAL_MANY_PORTS 70 70 - #define EXTRA_SERIAL_PORT_DEFNS \ 71 71 - { 0, BASE_BAUD, 0x1A0, 9, FOURPORT_FLAGS }, /* ttyS4 */ \ 72 72 - { 0, BASE_BAUD, 0x1A8, 9, FOURPORT_FLAGS }, /* ttyS5 */ \ 73 73 - { 0, BASE_BAUD, 0x1B0, 9, FOURPORT_FLAGS }, /* ttyS6 */ \ 74 74 - { 0, BASE_BAUD, 0x1B8, 9, FOURPORT_FLAGS }, /* ttyS7 */ \ 75 75 - { 0, BASE_BAUD, 0x2A0, 5, FOURPORT_FLAGS }, /* ttyS8 */ \ 76 76 - { 0, BASE_BAUD, 0x2A8, 5, FOURPORT_FLAGS }, /* ttyS9 */ \ 77 77 - { 0, BASE_BAUD, 0x2B0, 5, FOURPORT_FLAGS }, /* ttyS10 */ \ 78 78 - { 0, BASE_BAUD, 0x2B8, 5, FOURPORT_FLAGS }, /* ttyS11 */ \ 79 79 - { 0, BASE_BAUD, 0x330, 4, ACCENT_FLAGS }, /* ttyS12 */ \ 80 80 - { 0, BASE_BAUD, 0x338, 4, ACCENT_FLAGS }, /* ttyS13 */ \ 81 81 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS14 (spare) */ \ 82 82 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS15 (spare) */ \ 83 83 - { 0, BASE_BAUD, 0x100, 12, BOCA_FLAGS }, /* ttyS16 */ \ 84 84 - { 0, BASE_BAUD, 0x108, 12, BOCA_FLAGS }, /* ttyS17 */ \ 85 85 - { 0, BASE_BAUD, 0x110, 12, BOCA_FLAGS }, /* ttyS18 */ \ 86 86 - { 0, BASE_BAUD, 0x118, 12, BOCA_FLAGS }, /* ttyS19 */ \ 87 87 - { 0, BASE_BAUD, 0x120, 12, BOCA_FLAGS }, /* ttyS20 */ \ 88 88 - { 0, BASE_BAUD, 0x128, 12, BOCA_FLAGS }, /* ttyS21 */ \ 89 89 - { 0, BASE_BAUD, 0x130, 12, BOCA_FLAGS }, /* ttyS22 */ \ 90 90 - { 0, BASE_BAUD, 0x138, 12, BOCA_FLAGS }, /* ttyS23 */ \ 91 91 - { 0, BASE_BAUD, 0x140, 12, BOCA_FLAGS }, /* ttyS24 */ \ 92 92 - { 0, BASE_BAUD, 0x148, 12, BOCA_FLAGS }, /* ttyS25 */ \ 93 93 - { 0, BASE_BAUD, 0x150, 12, BOCA_FLAGS }, /* ttyS26 */ \ 94 94 - { 0, BASE_BAUD, 0x158, 12, BOCA_FLAGS }, /* ttyS27 */ \ 95 95 - { 0, BASE_BAUD, 0x160, 12, BOCA_FLAGS }, /* ttyS28 */ \ 96 96 - { 0, BASE_BAUD, 0x168, 12, BOCA_FLAGS }, /* ttyS29 */ \ 97 97 - { 0, BASE_BAUD, 0x170, 12, BOCA_FLAGS }, /* ttyS30 */ \ 98 98 - { 0, BASE_BAUD, 0x178, 12, BOCA_FLAGS }, /* ttyS31 */ 99 99 - #else 100 100 - #define EXTRA_SERIAL_PORT_DEFNS 101 101 - #endif 102 102 - 103 103 - /* You can have up to four HUB6's in the system, but I've only 104 104 - * included two cards here for a total of twelve ports. 105 105 - */ 106 106 - #if (defined(CONFIG_HUB6) && defined(CONFIG_SERIAL_MANY_PORTS)) 107 107 - #define HUB6_SERIAL_PORT_DFNS \ 108 108 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,0) }, /* ttyS32 */ \ 109 109 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,1) }, /* ttyS33 */ \ 110 110 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,2) }, /* ttyS34 */ \ 111 111 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,3) }, /* ttyS35 */ \ 112 112 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,4) }, /* ttyS36 */ \ 113 113 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,5) }, /* ttyS37 */ \ 114 114 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,0) }, /* ttyS38 */ \ 115 115 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,1) }, /* ttyS39 */ \ 116 116 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,2) }, /* ttyS40 */ \ 117 117 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,3) }, /* ttyS41 */ \ 118 118 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,4) }, /* ttyS42 */ \ 119 119 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,5) }, /* ttyS43 */ 120 120 - #else 121 121 - #define HUB6_SERIAL_PORT_DFNS 122 122 - #endif 123 123 - 124 124 - #define SERIAL_PORT_DFNS \ 125 125 - STD_SERIAL_PORT_DEFNS \ 126 126 - EXTRA_SERIAL_PORT_DEFNS \ 127 127 - HUB6_SERIAL_PORT_DFNS

+1 -4

include/asm-sh/bigsur/serial.h

reviewed

··· 14 14 #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) 15 15 16 16 17 17 - #define STD_SERIAL_PORT_DEFNS \ 17 17 + #define SERIAL_PORT_DFNS \ 18 18 /* UART CLK PORT IRQ FLAGS */ \ 19 19 { 0, BASE_BAUD, 0x3F8, HD64465_IRQ_UART, STD_COM_FLAGS } /* ttyS0 */ 20 20 - 21 21 - 22 22 - #define SERIAL_PORT_DFNS STD_SERIAL_PORT_DEFNS 23 20 24 21 /* XXX: This should be moved ino irq.h */ 25 22 #define irq_cannonicalize(x) (x)

+1 -3

include/asm-sh/ec3104/serial.h

reviewed

··· 10 10 * it's got the keyboard controller behind it so we can't really use it 11 11 * (without moving the keyboard driver to userspace, which doesn't sound 12 12 * like a very good idea) */ 13 13 - #define STD_SERIAL_PORT_DEFNS \ 13 13 + #define SERIAL_PORT_DFNS \ 14 14 /* UART CLK PORT IRQ FLAGS */ \ 15 15 { 0, BASE_BAUD, 0x11C00, EC3104_IRQBASE+7, STD_COM_FLAGS }, /* ttyS0 */ \ 16 16 { 0, BASE_BAUD, 0x12000, EC3104_IRQBASE+8, STD_COM_FLAGS }, /* ttyS1 */ \ 17 17 { 0, BASE_BAUD, 0x12400, EC3104_IRQBASE+9, STD_COM_FLAGS }, /* ttyS2 */ 18 18 - 19 19 - #define SERIAL_PORT_DFNS STD_SERIAL_PORT_DEFNS 20 18 21 19 /* XXX: This should be moved ino irq.h */ 22 20 #define irq_cannonicalize(x) (x)

+2 -4

include/asm-sh/serial.h

reviewed

··· 29 29 #ifdef CONFIG_HD64465 30 30 #include <asm/hd64465.h> 31 31 32 32 - #define STD_SERIAL_PORT_DEFNS \ 32 32 + #define SERIAL_PORT_DFNS \ 33 33 /* UART CLK PORT IRQ FLAGS */ \ 34 34 { 0, BASE_BAUD, 0x3F8, HD64465_IRQ_UART, STD_COM_FLAGS } /* ttyS0 */ 35 35 36 36 #else 37 37 38 38 - #define STD_SERIAL_PORT_DEFNS \ 38 38 + #define SERIAL_PORT_DFNS \ 39 39 /* UART CLK PORT IRQ FLAGS */ \ 40 40 { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ 41 41 { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS } /* ttyS1 */ 42 42 43 43 #endif 44 44 - 45 45 - #define SERIAL_PORT_DFNS STD_SERIAL_PORT_DEFNS 46 44 47 45 #endif 48 46 #endif /* _ASM_SERIAL_H */

+1 -3

include/asm-sh64/serial.h

reviewed

··· 20 20 21 21 #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) 22 22 23 23 - #define STD_SERIAL_PORT_DEFNS \ 23 23 + #define SERIAL_PORT_DFNS \ 24 24 /* UART CLK PORT IRQ FLAGS */ \ 25 25 { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ 26 26 { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS } /* ttyS1 */ 27 27 - 28 28 - #define SERIAL_PORT_DFNS STD_SERIAL_PORT_DEFNS 29 27 30 28 /* XXX: This should be moved ino irq.h */ 31 29 #define irq_cannonicalize(x) (x)

+1 -101

include/asm-x86_64/serial.h

reviewed

··· 22 22 #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF 23 23 #endif 24 24 25 25 - #ifdef CONFIG_SERIAL_MANY_PORTS 26 26 - #define FOURPORT_FLAGS ASYNC_FOURPORT 27 27 - #define ACCENT_FLAGS 0 28 28 - #define BOCA_FLAGS 0 29 29 - #define HUB6_FLAGS 0 30 30 - #endif 31 31 - 32 32 - #define MCA_COM_FLAGS (STD_COM_FLAGS|ASYNC_BOOT_ONLYMCA) 33 33 - 34 34 - /* 35 35 - * The following define the access methods for the HUB6 card. All 36 36 - * access is through two ports for all 24 possible chips. The card is 37 37 - * selected through the high 2 bits, the port on that card with the 38 38 - * "middle" 3 bits, and the register on that port with the bottom 39 39 - * 3 bits. 40 40 - * 41 41 - * While the access port and interrupt is configurable, the default 42 42 - * port locations are 0x302 for the port control register, and 0x303 43 43 - * for the data read/write register. Normally, the interrupt is at irq3 44 44 - * but can be anything from 3 to 7 inclusive. Note that using 3 will 45 45 - * require disabling com2. 46 46 - */ 47 47 - 48 48 - #define C_P(card,port) (((card)<<6|(port)<<3) + 1) 49 49 - 50 50 - #define STD_SERIAL_PORT_DEFNS \ 25 25 + #define SERIAL_PORT_DFNS \ 51 26 /* UART CLK PORT IRQ FLAGS */ \ 52 27 { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ 53 28 { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ 54 29 { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ 55 30 { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ 56 56 - 57 57 - 58 58 - #ifdef CONFIG_SERIAL_MANY_PORTS 59 59 - #define EXTRA_SERIAL_PORT_DEFNS \ 60 60 - { 0, BASE_BAUD, 0x1A0, 9, FOURPORT_FLAGS }, /* ttyS4 */ \ 61 61 - { 0, BASE_BAUD, 0x1A8, 9, FOURPORT_FLAGS }, /* ttyS5 */ \ 62 62 - { 0, BASE_BAUD, 0x1B0, 9, FOURPORT_FLAGS }, /* ttyS6 */ \ 63 63 - { 0, BASE_BAUD, 0x1B8, 9, FOURPORT_FLAGS }, /* ttyS7 */ \ 64 64 - { 0, BASE_BAUD, 0x2A0, 5, FOURPORT_FLAGS }, /* ttyS8 */ \ 65 65 - { 0, BASE_BAUD, 0x2A8, 5, FOURPORT_FLAGS }, /* ttyS9 */ \ 66 66 - { 0, BASE_BAUD, 0x2B0, 5, FOURPORT_FLAGS }, /* ttyS10 */ \ 67 67 - { 0, BASE_BAUD, 0x2B8, 5, FOURPORT_FLAGS }, /* ttyS11 */ \ 68 68 - { 0, BASE_BAUD, 0x330, 4, ACCENT_FLAGS }, /* ttyS12 */ \ 69 69 - { 0, BASE_BAUD, 0x338, 4, ACCENT_FLAGS }, /* ttyS13 */ \ 70 70 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS14 (spare) */ \ 71 71 - { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS15 (spare) */ \ 72 72 - { 0, BASE_BAUD, 0x100, 12, BOCA_FLAGS }, /* ttyS16 */ \ 73 73 - { 0, BASE_BAUD, 0x108, 12, BOCA_FLAGS }, /* ttyS17 */ \ 74 74 - { 0, BASE_BAUD, 0x110, 12, BOCA_FLAGS }, /* ttyS18 */ \ 75 75 - { 0, BASE_BAUD, 0x118, 12, BOCA_FLAGS }, /* ttyS19 */ \ 76 76 - { 0, BASE_BAUD, 0x120, 12, BOCA_FLAGS }, /* ttyS20 */ \ 77 77 - { 0, BASE_BAUD, 0x128, 12, BOCA_FLAGS }, /* ttyS21 */ \ 78 78 - { 0, BASE_BAUD, 0x130, 12, BOCA_FLAGS }, /* ttyS22 */ \ 79 79 - { 0, BASE_BAUD, 0x138, 12, BOCA_FLAGS }, /* ttyS23 */ \ 80 80 - { 0, BASE_BAUD, 0x140, 12, BOCA_FLAGS }, /* ttyS24 */ \ 81 81 - { 0, BASE_BAUD, 0x148, 12, BOCA_FLAGS }, /* ttyS25 */ \ 82 82 - { 0, BASE_BAUD, 0x150, 12, BOCA_FLAGS }, /* ttyS26 */ \ 83 83 - { 0, BASE_BAUD, 0x158, 12, BOCA_FLAGS }, /* ttyS27 */ \ 84 84 - { 0, BASE_BAUD, 0x160, 12, BOCA_FLAGS }, /* ttyS28 */ \ 85 85 - { 0, BASE_BAUD, 0x168, 12, BOCA_FLAGS }, /* ttyS29 */ \ 86 86 - { 0, BASE_BAUD, 0x170, 12, BOCA_FLAGS }, /* ttyS30 */ \ 87 87 - { 0, BASE_BAUD, 0x178, 12, BOCA_FLAGS }, /* ttyS31 */ 88 88 - #else 89 89 - #define EXTRA_SERIAL_PORT_DEFNS 90 90 - #endif 91 91 - 92 92 - /* You can have up to four HUB6's in the system, but I've only 93 93 - * included two cards here for a total of twelve ports. 94 94 - */ 95 95 - #if (defined(CONFIG_HUB6) && defined(CONFIG_SERIAL_MANY_PORTS)) 96 96 - #define HUB6_SERIAL_PORT_DFNS \ 97 97 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,0) }, /* ttyS32 */ \ 98 98 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,1) }, /* ttyS33 */ \ 99 99 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,2) }, /* ttyS34 */ \ 100 100 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,3) }, /* ttyS35 */ \ 101 101 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,4) }, /* ttyS36 */ \ 102 102 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(0,5) }, /* ttyS37 */ \ 103 103 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,0) }, /* ttyS38 */ \ 104 104 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,1) }, /* ttyS39 */ \ 105 105 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,2) }, /* ttyS40 */ \ 106 106 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,3) }, /* ttyS41 */ \ 107 107 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,4) }, /* ttyS42 */ \ 108 108 - { 0, BASE_BAUD, 0x302, 3, HUB6_FLAGS, C_P(1,5) }, /* ttyS43 */ 109 109 - #else 110 110 - #define HUB6_SERIAL_PORT_DFNS 111 111 - #endif 112 112 - 113 113 - #ifdef CONFIG_MCA 114 114 - #define MCA_SERIAL_PORT_DFNS \ 115 115 - { 0, BASE_BAUD, 0x3220, 3, MCA_COM_FLAGS }, \ 116 116 - { 0, BASE_BAUD, 0x3228, 3, MCA_COM_FLAGS }, \ 117 117 - { 0, BASE_BAUD, 0x4220, 3, MCA_COM_FLAGS }, \ 118 118 - { 0, BASE_BAUD, 0x4228, 3, MCA_COM_FLAGS }, \ 119 119 - { 0, BASE_BAUD, 0x5220, 3, MCA_COM_FLAGS }, \ 120 120 - { 0, BASE_BAUD, 0x5228, 3, MCA_COM_FLAGS }, 121 121 - #else 122 122 - #define MCA_SERIAL_PORT_DFNS 123 123 - #endif 124 124 - 125 125 - #define SERIAL_PORT_DFNS \ 126 126 - STD_SERIAL_PORT_DEFNS \ 127 127 - EXTRA_SERIAL_PORT_DEFNS \ 128 128 - HUB6_SERIAL_PORT_DFNS \ 129 129 - MCA_SERIAL_PORT_DFNS 130 130 -