aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorShinya Kuribayashi <shinya.kuribayashi.px@renesas.com>2013-10-08 00:24:28 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-16 16:07:14 -0400
commit12082ba2cb053e547dd3faef7af4842f2abe7c19 (patch)
tree6ec6f8aab2519c817b760a0a511c0489a48b448d /drivers
parent8eaede49dfdc1ff1d727f9c913665b8009945191 (diff)
serial8250-em: convert to clk_prepare/unprepare
Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can migrate to the common clock framework. Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> [takashi.yoshii.ze@renesas.com: edited for conflicts] Signed-off-by: Takashi Yoshii <takashi.yoshii.zj@renesas.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/8250/8250_em.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index 5f3bba12c159..d1a9078003bd 100644
--- a/drivers/tty/serial/8250/8250_em.c
+++ b/drivers/tty/serial/8250/8250_em.c
@@ -122,7 +122,7 @@ static int serial8250_em_probe(struct platform_device *pdev)
122 up.port.dev = &pdev->dev; 122 up.port.dev = &pdev->dev;
123 up.port.private_data = priv; 123 up.port.private_data = priv;
124 124
125 clk_enable(priv->sclk); 125 clk_prepare_enable(priv->sclk);
126 up.port.uartclk = clk_get_rate(priv->sclk); 126 up.port.uartclk = clk_get_rate(priv->sclk);
127 127
128 up.port.iotype = UPIO_MEM32; 128 up.port.iotype = UPIO_MEM32;
@@ -134,7 +134,7 @@ static int serial8250_em_probe(struct platform_device *pdev)
134 ret = serial8250_register_8250_port(&up); 134 ret = serial8250_register_8250_port(&up);
135 if (ret < 0) { 135 if (ret < 0) {
136 dev_err(&pdev->dev, "unable to register 8250 port\n"); 136 dev_err(&pdev->dev, "unable to register 8250 port\n");
137 clk_disable(priv->sclk); 137 clk_disable_unprepare(priv->sclk);
138 return ret; 138 return ret;
139 } 139 }
140 140
@@ -148,7 +148,7 @@ static int serial8250_em_remove(struct platform_device *pdev)
148 struct serial8250_em_priv *priv = platform_get_drvdata(pdev); 148 struct serial8250_em_priv *priv = platform_get_drvdata(pdev);
149 149
150 serial8250_unregister_port(priv->line); 150 serial8250_unregister_port(priv->line);
151 clk_disable(priv->sclk); 151 clk_disable_unprepare(priv->sclk);
152 return 0; 152 return 0;
153} 153}
154 154