diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2012-07-20 21:29:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-25 09:27:38 +0200 |
| commit | abd875def2388eeddcdbd1916d96a6b74552c61d (patch) | |
| tree | 56364bb7e8e865440c1470b8364ec30ac37413dd /drivers/serial/serial_s3c.c | |
| parent | 49347e4cbb94565cec1ea7763a3d861413f6b161 (diff) | |
| download | barebox-abd875def2388eeddcdbd1916d96a6b74552c61d.tar.gz barebox-abd875def2388eeddcdbd1916d96a6b74552c61d.tar.xz | |
Samsung/serial: make the code more readable
This bit magic is just setting and reading the UART's selected clock source.
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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c index ff3792b04e..c537bc0edc 100644 --- a/drivers/serial/serial_s3c.c +++ b/drivers/serial/serial_s3c.c @@ -31,6 +31,8 @@ /* Note: Offsets are for little endian access */ #define ULCON 0x00 /* line control */ #define UCON 0x04 /* UART control */ +# define UCON_SET_CLK_SRC(x) (((x) & 0x03) << 10) +# define UCON_GET_CLK_SRC(x) (((x) >> 10) & 0x03) #define UFCON 0x08 /* FIFO control */ #define UMCON 0x0c /* modem control */ #define UTRSTAT 0x10 /* Rx/Tx status */ @@ -62,8 +64,7 @@ struct s3c_uart { static unsigned s3c_get_arch_uart_input_clock(void __iomem *base) { unsigned reg = readw(base + UCON); - reg = (reg >> 10) & 0x3; - return s3c_get_uart_clk(reg); + return s3c_get_uart_clk(UCON_GET_CLK_SRC(reg)); } #ifdef S3C_UART_HAS_UBRDIVSLOT @@ -108,7 +109,8 @@ static int s3c_serial_init_port(struct console_device *cdev) /* tx=level,rx=edge,disable timeout int.,enable rx error int., * normal, interrupt or polling, no pre-divider */ - writew(0x0245 | ((S3C_UART_CLKSEL) << 10), base + UCON); + writew(0x0245 | UCON_SET_CLK_SRC(S3C_UART_CLKSEL), + base + UCON); #ifdef S3C_UART_HAS_UINTM /* 'interrupt or polling mode' for both directions */ |