[PATCH] serial8250-em: convert to clk_prepare/unprepare

[PATCH] serial8250-em: convert to clk_prepare/unprepare

[Simon Horman]

Hi Greg,

please consider this enhancement from Kuribayashi-san for serial8250-em.

Also, please let me know if you would like us to handle serial patches
a different way.

Shinya Kuribayashi (1):
  serial8250-em: convert to clk_prepare/unprepare

 drivers/tty/serial/8250/8250_em.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
1.8.4

[PATCH] serial8250-em: convert to clk_prepare/unprepare

[Simon Horman]

From: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>

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>
---
 drivers/tty/serial/8250/8250_em.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index 5f3bba1..d1a9078 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)
 	up.port.dev = &pdev->dev;
 	up.port.private_data = priv;
 
-	clk_enable(priv->sclk);
+	clk_prepare_enable(priv->sclk);
 	up.port.uartclk = clk_get_rate(priv->sclk);
 
 	up.port.iotype = UPIO_MEM32;
@@ -134,7 +134,7 @@ static int serial8250_em_probe(struct platform_device *pdev)
 	ret = serial8250_register_8250_port(&up);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "unable to register 8250 port\n");
-		clk_disable(priv->sclk);
+		clk_disable_unprepare(priv->sclk);
 		return ret;
 	}
 
@@ -148,7 +148,7 @@ static int serial8250_em_remove(struct platform_device *pdev)
 	struct serial8250_em_priv *priv = platform_get_drvdata(pdev);
 
 	serial8250_unregister_port(priv->line);
-	clk_disable(priv->sclk);
+	clk_disable_unprepare(priv->sclk);
 	return 0;
 }
 
-- 
1.8.4

Re: [PATCH] serial8250-em: convert to clk_prepare/unprepare

[Greg Kroah-Hartman]

On Tue, Oct 08, 2013 at 01:24:27PM +0900, Simon Horman wrote:
> Hi Greg,
> 
> please consider this enhancement from Kuribayashi-san for serial8250-em.
> 
> Also, please let me know if you would like us to handle serial patches
> a different way.

No, this works for me, if it works for you, that's fine with me.

thanks,

greg k-h

Re: [PATCH] serial8250-em: convert to clk_prepare/unprepare

[Simon Horman]

On Wed, Oct 16, 2013 at 01:06:51PM -0700, Greg Kroah-Hartman wrote:
> On Tue, Oct 08, 2013 at 01:24:27PM +0900, Simon Horman wrote:
> > Hi Greg,
> > 
> > please consider this enhancement from Kuribayashi-san for serial8250-em.
> > 
> > Also, please let me know if you would like us to handle serial patches
> > a different way.
> 
> No, this works for me, if it works for you, that's fine with me.

Thanks, it works for me too.