Commit ef5ca193 authored by Richard Zhao's avatar Richard Zhao Committed by Sascha Hauer

serial: imx: add clk_prepare/clk_unprepare

It's for migrating to generic clk framework API.
Signed-off-by: default avatarRichard Zhao <richard.zhao@linaro.org>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 8186064c
...@@ -1508,7 +1508,7 @@ static int serial_imx_probe(struct platform_device *pdev) ...@@ -1508,7 +1508,7 @@ static int serial_imx_probe(struct platform_device *pdev)
ret = PTR_ERR(sport->clk); ret = PTR_ERR(sport->clk);
goto unmap; goto unmap;
} }
clk_enable(sport->clk); clk_prepare_enable(sport->clk);
sport->port.uartclk = clk_get_rate(sport->clk); sport->port.uartclk = clk_get_rate(sport->clk);
...@@ -1531,8 +1531,8 @@ static int serial_imx_probe(struct platform_device *pdev) ...@@ -1531,8 +1531,8 @@ static int serial_imx_probe(struct platform_device *pdev)
if (pdata && pdata->exit) if (pdata && pdata->exit)
pdata->exit(pdev); pdata->exit(pdev);
clkput: clkput:
clk_disable_unprepare(sport->clk);
clk_put(sport->clk); clk_put(sport->clk);
clk_disable(sport->clk);
unmap: unmap:
iounmap(sport->port.membase); iounmap(sport->port.membase);
free: free:
...@@ -1552,11 +1552,10 @@ static int serial_imx_remove(struct platform_device *pdev) ...@@ -1552,11 +1552,10 @@ static int serial_imx_remove(struct platform_device *pdev)
if (sport) { if (sport) {
uart_remove_one_port(&imx_reg, &sport->port); uart_remove_one_port(&imx_reg, &sport->port);
clk_disable_unprepare(sport->clk);
clk_put(sport->clk); clk_put(sport->clk);
} }
clk_disable(sport->clk);
if (pdata && pdata->exit) if (pdata && pdata->exit)
pdata->exit(pdev); pdata->exit(pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment