Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6.git] / drivers / tty / serial / mxs-auart.c
index 076169f..55fd362 100644 (file)
@@ -425,7 +425,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);
 
@@ -454,7 +454,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)
@@ -635,7 +635,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);
@@ -644,7 +644,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;
 }