diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250_pci.c | 14 | ||||
-rw-r--r-- | drivers/serial/sunsab.c | 9 | ||||
-rw-r--r-- | drivers/serial/sunzilog.c | 3 |
3 files changed, 26 insertions, 0 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index a1d322f8a16c..cd1979daf2b8 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -936,6 +936,7 @@ enum pci_board_num_t { | |||
936 | pbn_b1_8_1382400, | 936 | pbn_b1_8_1382400, |
937 | 937 | ||
938 | pbn_b2_1_115200, | 938 | pbn_b2_1_115200, |
939 | pbn_b2_2_115200, | ||
939 | pbn_b2_8_115200, | 940 | pbn_b2_8_115200, |
940 | 941 | ||
941 | pbn_b2_1_460800, | 942 | pbn_b2_1_460800, |
@@ -1243,6 +1244,12 @@ static struct pciserial_board pci_boards[] __devinitdata = { | |||
1243 | .base_baud = 115200, | 1244 | .base_baud = 115200, |
1244 | .uart_offset = 8, | 1245 | .uart_offset = 8, |
1245 | }, | 1246 | }, |
1247 | [pbn_b2_2_115200] = { | ||
1248 | .flags = FL_BASE2, | ||
1249 | .num_ports = 2, | ||
1250 | .base_baud = 115200, | ||
1251 | .uart_offset = 8, | ||
1252 | }, | ||
1246 | [pbn_b2_8_115200] = { | 1253 | [pbn_b2_8_115200] = { |
1247 | .flags = FL_BASE2, | 1254 | .flags = FL_BASE2, |
1248 | .num_ports = 8, | 1255 | .num_ports = 8, |
@@ -2340,6 +2347,13 @@ static struct pci_device_id serial_pci_tbl[] = { | |||
2340 | pbn_b0_1_115200 }, | 2347 | pbn_b0_1_115200 }, |
2341 | 2348 | ||
2342 | /* | 2349 | /* |
2350 | * IntaShield IS-200 | ||
2351 | */ | ||
2352 | { PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200, | ||
2353 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0811 */ | ||
2354 | pbn_b2_2_115200 }, | ||
2355 | |||
2356 | /* | ||
2343 | * These entries match devices with class COMMUNICATION_SERIAL, | 2357 | * These entries match devices with class COMMUNICATION_SERIAL, |
2344 | * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL | 2358 | * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL |
2345 | */ | 2359 | */ |
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index dc673e1b6fd9..cfe20f730436 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
@@ -886,6 +886,15 @@ static int sunsab_console_setup(struct console *con, char *options) | |||
886 | unsigned long flags; | 886 | unsigned long flags; |
887 | unsigned int baud, quot; | 887 | unsigned int baud, quot; |
888 | 888 | ||
889 | /* | ||
890 | * The console framework calls us for each and every port | ||
891 | * registered. Defer the console setup until the requested | ||
892 | * port has been properly discovered. A bit of a hack, | ||
893 | * though... | ||
894 | */ | ||
895 | if (up->port.type != PORT_SUNSAB) | ||
896 | return -1; | ||
897 | |||
889 | printk("Console: ttyS%d (SAB82532)\n", | 898 | printk("Console: ttyS%d (SAB82532)\n", |
890 | (sunsab_reg.minor - 64) + con->index); | 899 | (sunsab_reg.minor - 64) + con->index); |
891 | 900 | ||
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 47bc3d57e019..d34f336d53d8 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -1146,6 +1146,9 @@ static int __init sunzilog_console_setup(struct console *con, char *options) | |||
1146 | unsigned long flags; | 1146 | unsigned long flags; |
1147 | int baud, brg; | 1147 | int baud, brg; |
1148 | 1148 | ||
1149 | if (up->port.type != PORT_SUNZILOG) | ||
1150 | return -1; | ||
1151 | |||
1149 | printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n", | 1152 | printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n", |
1150 | (sunzilog_reg.minor - 64) + con->index, con->index); | 1153 | (sunzilog_reg.minor - 64) + con->index, con->index); |
1151 | 1154 | ||