Skip to content

Commit

Permalink
serial: sh-sci: Convert to clk_prepare/unprepare
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Simon Horman committed Dec 14, 2013
1 parent caec703 commit b016b64
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,9 @@ static void sci_port_enable(struct sci_port *sci_port)

pm_runtime_get_sync(sci_port->port.dev);

clk_enable(sci_port->iclk);
clk_prepare_enable(sci_port->iclk);
sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
clk_enable(sci_port->fclk);
clk_prepare_enable(sci_port->fclk);
}

static void sci_port_disable(struct sci_port *sci_port)
Expand All @@ -439,8 +439,8 @@ static void sci_port_disable(struct sci_port *sci_port)
del_timer_sync(&sci_port->break_timer);
sci_port->break_flag = 0;

clk_disable(sci_port->fclk);
clk_disable(sci_port->iclk);
clk_disable_unprepare(sci_port->fclk);
clk_disable_unprepare(sci_port->iclk);

pm_runtime_put_sync(sci_port->port.dev);
}
Expand Down

0 comments on commit b016b64

Please sign in to comment.