Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[profile/ivi/kernel-adaptation-intel-automotive.git] / drivers / tty / serial / pxa.c

diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index cdf4b2b..5847a4b 100644 (file)
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -582,9 +582,9 @@ serial_pxa_pm(struct uart_port *port, unsigned int state,
        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
 
        if (!state)
-               clk_enable(up->clk);
+               clk_prepare_enable(up->clk);
        else
-               clk_disable(up->clk);
+               clk_disable_unprepare(up->clk);
 }
 
 static void serial_pxa_release_port(struct uart_port *port)
@@ -671,7 +671,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
        struct uart_pxa_port *up = serial_pxa_ports[co->index];
        unsigned int ier;
 
-       clk_enable(up->clk);
+       clk_prepare_enable(up->clk);
 
        /*
         *      First save the IER then disable the interrupts
@@ -688,7 +688,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
        wait_for_xmitr(up);
        serial_out(up, UART_IER, ier);
 
-       clk_disable(up->clk);
+       clk_disable_unprepare(up->clk);
 }
 
 static int __init