diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2012-07-24 11:24:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-25 09:27:38 +0200 |
| commit | c5066ad4cd42251ff0690a382c6dd93d0f07e3dc (patch) | |
| tree | 2ae82e0b6ede1251e70fc0a8c428f59902277465 /drivers/serial/serial_s3c.c | |
| parent | 4b2dfa8188f7a1563ce203a79539a3873a3ab477 (diff) | |
| download | barebox-c5066ad4cd42251ff0690a382c6dd93d0f07e3dc.tar.gz barebox-c5066ad4cd42251ff0690a382c6dd93d0f07e3dc.tar.xz | |
Samsung/serial: move the decision about an improved UART into Kconfig
More or less just cosmetic (removing ifdefs!).
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/serial/serial_s3c.c')
| -rw-r--r-- | drivers/serial/serial_s3c.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c index 2cb2eef33c..877ccd2e17 100644 --- a/drivers/serial/serial_s3c.c +++ b/drivers/serial/serial_s3c.c @@ -79,10 +79,11 @@ static int s3c_serial_setbaudrate(struct console_device *cdev, int baudrate) void __iomem *base = priv->regs; unsigned val; -#ifdef S3C_UART_HAS_UBRDIVSLOT - val = s3c_get_arch_uart_input_clock(base) / baudrate; - writew(udivslot_table[val & 15], base + UBRDIVSLOT); -#endif + if (IS_ENABLED(CONFIG_DRIVER_SERIAL_S3C_IMPROVED)) { + val = s3c_get_arch_uart_input_clock(base) / baudrate; + writew(udivslot_table[val & 15], base + UBRDIVSLOT); + } + val = s3c_get_arch_uart_input_clock(base) / (16 * baudrate) - 1; writew(val, base + UBRDIV); @@ -106,10 +107,9 @@ static int s3c_serial_init_port(struct console_device *cdev) writew(0x0245 | UCON_SET_CLK_SRC(S3C_UART_CLKSEL), base + UCON); -#ifdef S3C_UART_HAS_UINTM - /* 'interrupt or polling mode' for both directions */ - writeb(0xf, base + UINTM); -#endif + if (IS_ENABLED(CONFIG_DRIVER_SERIAL_S3C_IMPROVED)) + /* 'interrupt or polling mode' for both directions */ + writeb(0xf, base + UINTM); if (IS_ENABLED(CONFIG_DRIVER_SERIAL_S3C_AUTOSYNC)) writeb(0x10, base + UMCON); /* enable auto flow control */ |