diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250_gsc.c | 4 | ||||
-rw-r--r-- | drivers/serial/Kconfig | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c index 1ebe6b585d2d..c5d0addfda4f 100644 --- a/drivers/serial/8250_gsc.c +++ b/drivers/serial/8250_gsc.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <asm/hardware.h> | 22 | #include <asm/hardware.h> |
23 | #include <asm/parisc-device.h> | 23 | #include <asm/parisc-device.h> |
24 | #include <asm/io.h> | 24 | #include <asm/io.h> |
25 | #include <asm/serial.h> /* for LASI_BASE_BAUD */ | ||
26 | 25 | ||
27 | #include "8250.h" | 26 | #include "8250.h" |
28 | 27 | ||
@@ -54,7 +53,8 @@ serial_init_chip(struct parisc_device *dev) | |||
54 | 53 | ||
55 | memset(&port, 0, sizeof(port)); | 54 | memset(&port, 0, sizeof(port)); |
56 | port.iotype = UPIO_MEM; | 55 | port.iotype = UPIO_MEM; |
57 | port.uartclk = LASI_BASE_BAUD * 16; | 56 | /* 7.272727MHz on Lasi. Assumed the same for Dino, Wax and Timi. */ |
57 | port.uartclk = 7272727; | ||
58 | port.mapbase = address; | 58 | port.mapbase = address; |
59 | port.membase = ioremap_nocache(address, 16); | 59 | port.membase = ioremap_nocache(address, 16); |
60 | port.irq = dev->irq; | 60 | port.irq = dev->irq; |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 653098bc2dd5..8edee745888a 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -556,10 +556,11 @@ config SERIAL_MUX | |||
556 | default y | 556 | default y |
557 | ---help--- | 557 | ---help--- |
558 | Saying Y here will enable the hardware MUX serial driver for | 558 | Saying Y here will enable the hardware MUX serial driver for |
559 | the Nova and K class systems. The hardware MUX is not 8250/16550 | 559 | the Nova, K class systems and D class with a 'remote control card'. |
560 | compatible therefore the /dev/ttyB0 device is shared between the | 560 | The hardware MUX is not 8250/16550 compatible therefore the |
561 | Serial MUX and the PDC software console. The following steps | 561 | /dev/ttyB0 device is shared between the Serial MUX and the PDC |
562 | need to be completed to use the Serial MUX: | 562 | software console. The following steps need to be completed to use |
563 | the Serial MUX: | ||
563 | 564 | ||
564 | 1. create the device entry (mknod /dev/ttyB0 c 11 0) | 565 | 1. create the device entry (mknod /dev/ttyB0 c 11 0) |
565 | 2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0 | 566 | 2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0 |