diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-11-28 12:11:46 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-13 19:59:31 -0500 |
commit | b016b646e8676858f39ea9be760494b04b9ee0af (patch) | |
tree | ba1a0a045ea78606b7f6811e8d1236dd8ddae844 /drivers/tty | |
parent | caec70381b469d6ed1bd3d0441a19aa6de0bbff3 (diff) |
serial: sh-sci: Convert to clk_prepare/unprepare
Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
clk_disable_unprepare() to get ready for the migration to the common
clock framework.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/sh-sci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 1ebac3e9e53a..1a3fc7a2e4db 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c | |||
@@ -421,9 +421,9 @@ static void sci_port_enable(struct sci_port *sci_port) | |||
421 | 421 | ||
422 | pm_runtime_get_sync(sci_port->port.dev); | 422 | pm_runtime_get_sync(sci_port->port.dev); |
423 | 423 | ||
424 | clk_enable(sci_port->iclk); | 424 | clk_prepare_enable(sci_port->iclk); |
425 | sci_port->port.uartclk = clk_get_rate(sci_port->iclk); | 425 | sci_port->port.uartclk = clk_get_rate(sci_port->iclk); |
426 | clk_enable(sci_port->fclk); | 426 | clk_prepare_enable(sci_port->fclk); |
427 | } | 427 | } |
428 | 428 | ||
429 | static void sci_port_disable(struct sci_port *sci_port) | 429 | static void sci_port_disable(struct sci_port *sci_port) |
@@ -439,8 +439,8 @@ static void sci_port_disable(struct sci_port *sci_port) | |||
439 | del_timer_sync(&sci_port->break_timer); | 439 | del_timer_sync(&sci_port->break_timer); |
440 | sci_port->break_flag = 0; | 440 | sci_port->break_flag = 0; |
441 | 441 | ||
442 | clk_disable(sci_port->fclk); | 442 | clk_disable_unprepare(sci_port->fclk); |
443 | clk_disable(sci_port->iclk); | 443 | clk_disable_unprepare(sci_port->iclk); |
444 | 444 | ||
445 | pm_runtime_put_sync(sci_port->port.dev); | 445 | pm_runtime_put_sync(sci_port->port.dev); |
446 | } | 446 | } |