diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-12-20 14:10:29 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2011-12-28 21:30:48 +0800 |
| commit | a481377013c1c07dac0421886db7a6b4c3081c49 (patch) | |
| tree | 3cef0449d1b82fa101eafe77807e64d962176b64 /drivers/tty/serial/mxs-auart.c | |
| parent | e735489976c356a189f7332e6ff4b0dee2ede434 (diff) | |
| download | op-kernel-dev-a481377013c1c07dac0421886db7a6b4c3081c49.zip op-kernel-dev-a481377013c1c07dac0421886db7a6b4c3081c49.tar.gz | |
serial: mxs-auart: convert to clk_prepare/clk_unprepare
The patch converts mxs-auart driver to clk_prepare/clk_unprepare by
using helper functions clk_prepare_enable/clk_disable_unprepare.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'drivers/tty/serial/mxs-auart.c')
| -rw-r--r-- | drivers/tty/serial/mxs-auart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 7e02c9c..c33500a 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -424,7 +424,7 @@ static int mxs_auart_startup(struct uart_port *u) { struct mxs_auart_port *s = to_auart_port(u); - clk_enable(s->clk); + clk_prepare_enable(s->clk); writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_CLR); @@ -453,7 +453,7 @@ static void mxs_auart_shutdown(struct uart_port *u) writel(AUART_INTR_RXIEN | AUART_INTR_RTIEN | AUART_INTR_CTSMIEN, u->membase + AUART_INTR_CLR); - clk_disable(s->clk); + clk_disable_unprepare(s->clk); } static unsigned int mxs_auart_tx_empty(struct uart_port *u) @@ -634,7 +634,7 @@ auart_console_setup(struct console *co, char *options) if (!s) return -ENODEV; - clk_enable(s->clk); + clk_prepare_enable(s->clk); if (options) uart_parse_options(options, &baud, &parity, &bits, &flow); @@ -643,7 +643,7 @@ auart_console_setup(struct console *co, char *options) ret = uart_set_options(&s->port, co, baud, parity, bits, flow); - clk_disable(s->clk); + clk_disable_unprepare(s->clk); return ret; } |
