Skip to contentSkip to conversation

serial8250-em: convert to clk_prepare/unprepare

PATCH New Simon Horman 3 participants 4 messages Oct 8, 2013 – Oct 17, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 serial8250-em: convert to clk_prepare/unprepare

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(-)
Signature · 1 line
1.8.4
#1 lore raw

PATCH 1/1 serial8250-em: convert to clk_prepare/unprepare

From: Shinya Kuribayashi <[email protected]>

Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can migrate to the common clock framework.

---
 drivers/tty/serial/8250/8250_em.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250_em.c +3 -3
index 5f3bba1..d1a9078 100644
@@ -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;
 }
 
Signature · 1 line
1.8.4
#2 lore raw

PATCH 1/1 serial8250-em: convert to clk_prepare/unprepare

In reply to Simon Horman
Quoted 6 lines · 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.

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

thanks,

greg k-h

#3 lore raw

PATCH 1/1 serial8250-em: convert to clk_prepare/unprepare

Quoted 9 lines · Greg Kroah-Hartman
Quoted 6 lines · 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.

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

Thanks, it works for me too.