diff options
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 076169f50b01..55fd362b9879 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c | |||
@@ -425,7 +425,7 @@ static int mxs_auart_startup(struct uart_port *u) | |||
425 | { | 425 | { |
426 | struct mxs_auart_port *s = to_auart_port(u); | 426 | struct mxs_auart_port *s = to_auart_port(u); |
427 | 427 | ||
428 | clk_enable(s->clk); | 428 | clk_prepare_enable(s->clk); |
429 | 429 | ||
430 | writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_CLR); | 430 | writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_CLR); |
431 | 431 | ||
@@ -454,7 +454,7 @@ static void mxs_auart_shutdown(struct uart_port *u) | |||
454 | writel(AUART_INTR_RXIEN | AUART_INTR_RTIEN | AUART_INTR_CTSMIEN, | 454 | writel(AUART_INTR_RXIEN | AUART_INTR_RTIEN | AUART_INTR_CTSMIEN, |
455 | u->membase + AUART_INTR_CLR); | 455 | u->membase + AUART_INTR_CLR); |
456 | 456 | ||
457 | clk_disable(s->clk); | 457 | clk_disable_unprepare(s->clk); |
458 | } | 458 | } |
459 | 459 | ||
460 | static unsigned int mxs_auart_tx_empty(struct uart_port *u) | 460 | static unsigned int mxs_auart_tx_empty(struct uart_port *u) |
@@ -635,7 +635,7 @@ auart_console_setup(struct console *co, char *options) | |||
635 | if (!s) | 635 | if (!s) |
636 | return -ENODEV; | 636 | return -ENODEV; |
637 | 637 | ||
638 | clk_enable(s->clk); | 638 | clk_prepare_enable(s->clk); |
639 | 639 | ||
640 | if (options) | 640 | if (options) |
641 | uart_parse_options(options, &baud, &parity, &bits, &flow); | 641 | uart_parse_options(options, &baud, &parity, &bits, &flow); |
@@ -644,7 +644,7 @@ auart_console_setup(struct console *co, char *options) | |||
644 | 644 | ||
645 | ret = uart_set_options(&s->port, co, baud, parity, bits, flow); | 645 | ret = uart_set_options(&s->port, co, baud, parity, bits, flow); |
646 | 646 | ||
647 | clk_disable(s->clk); | 647 | clk_disable_unprepare(s->clk); |
648 | 648 | ||
649 | return ret; | 649 | return ret; |
650 | } | 650 | } |