diff options
| author | Antony Pavlov <antonynpavlov@gmail.com> | 2012-01-18 10:31:53 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-19 09:46:02 +0100 |
| commit | 5891ba14b86d4f480ee82f46a21f4c4d4b8172d0 (patch) | |
| tree | db42e0645d56f2ad1d57492cc51853e416ab49fc /drivers/serial/serial_ns16550.c | |
| parent | 2c9bc534cea232d0838203f08d7d128c8fc749a3 (diff) | |
| download | barebox-5891ba14b86d4f480ee82f46a21f4c4d4b8172d0.tar.gz barebox-5891ba14b86d4f480ee82f46a21f4c4d4b8172d0.tar.xz | |
ns16550: support for UART with broken FIFO
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/serial/serial_ns16550.c')
| -rw-r--r-- | drivers/serial/serial_ns16550.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 1217a5f249..4cef469c1b 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -139,6 +139,8 @@ static unsigned int ns16550_calc_divisor(struct console_device *cdev, static void ns16550_serial_init_port(struct console_device *cdev) { unsigned int baud_divisor; + struct NS16550_plat *plat = (struct NS16550_plat *) + cdev->dev->platform_data; /* Setup the serial port with the defaults first */ baud_divisor = ns16550_calc_divisor(cdev, CONFIG_BAUDRATE); @@ -153,7 +155,12 @@ static void ns16550_serial_init_port(struct console_device *cdev) ns16550_write(cdev, (baud_divisor >> 8) & 0xff, dlm); ns16550_write(cdev, LCRVAL, lcr); ns16550_write(cdev, MCRVAL, mcr); - ns16550_write(cdev, FCRVAL, fcr); + + if (plat->flags & NS16650_FLAG_DISABLE_FIFO) + ns16550_write(cdev, FCRVAL & ~FCR_FIFO_EN, fcr); + else + ns16550_write(cdev, FCRVAL, fcr); + #ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS ns16550_write(cdev, 0x00, mdr1); #endif @@ -211,6 +218,8 @@ static int ns16550_tstc(struct console_device *cdev) static int ns16550_setbaudrate(struct console_device *cdev, int baud_rate) { unsigned int baud_divisor = ns16550_calc_divisor(cdev, baud_rate); + struct NS16550_plat *plat = (struct NS16550_plat *) + cdev->dev->platform_data; ns16550_write(cdev, 0x00, ier); ns16550_write(cdev, LCR_BKSE, lcr); @@ -218,7 +227,12 @@ static int ns16550_setbaudrate(struct console_device *cdev, int baud_rate) ns16550_write(cdev, (baud_divisor >> 8) & 0xff, dlm); ns16550_write(cdev, LCRVAL, lcr); ns16550_write(cdev, MCRVAL, mcr); - ns16550_write(cdev, FCRVAL, fcr); + + if (plat->flags & NS16650_FLAG_DISABLE_FIFO) + ns16550_write(cdev, FCRVAL & ~FCR_FIFO_EN, fcr); + else + ns16550_write(cdev, FCRVAL, fcr); + return 0; } |