Skip to content

Commit

Permalink
serial: imx: add clk_prepare/clk_unprepare
Browse files Browse the repository at this point in the history
It's for migrating to generic clk framework API.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Richard Zhao authored and Sascha Hauer committed Feb 1, 2012
1 parent 8186064 commit ef5ca19
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/tty/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,7 @@ static int serial_imx_probe(struct platform_device *pdev)
ret = PTR_ERR(sport->clk);
goto unmap;
}
clk_enable(sport->clk);
clk_prepare_enable(sport->clk);

sport->port.uartclk = clk_get_rate(sport->clk);

Expand All @@ -1531,8 +1531,8 @@ static int serial_imx_probe(struct platform_device *pdev)
if (pdata && pdata->exit)
pdata->exit(pdev);
clkput:
clk_disable_unprepare(sport->clk);
clk_put(sport->clk);
clk_disable(sport->clk);
unmap:
iounmap(sport->port.membase);
free:
Expand All @@ -1552,11 +1552,10 @@ static int serial_imx_remove(struct platform_device *pdev)

if (sport) {
uart_remove_one_port(&imx_reg, &sport->port);
clk_disable_unprepare(sport->clk);
clk_put(sport->clk);
}

clk_disable(sport->clk);

if (pdata && pdata->exit)
pdata->exit(pdev);

Expand Down

0 comments on commit ef5ca19

Please sign in to comment.