| Message ID | 20130924131039.3c871cad7acb2a068a988d0f@ops.dti.ne.jp (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 1420cd1c178f73a44e330289ea5c7114cce6054f |
| Headers | show |
[ CCed Greg Kroah-Hartman, the serial maintainer for his review ] On Tue, Sep 24, 2013 at 01:10:39PM +0900, takasi-y@ops.dti.ne.jp wrote: > 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> > --- > 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.1.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Sep 24, 2013 at 01:44:32PM +0900, Simon Horman wrote: > [ CCed Greg Kroah-Hartman, the serial maintainer for his review ] > > On Tue, Sep 24, 2013 at 01:10:39PM +0900, takasi-y@ops.dti.ne.jp wrote: > > 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> -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Yoshii-san, Thank you for the patch. On Tuesday 24 September 2013 13:10:39 takasi-y@ops.dti.ne.jp wrote: > 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: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > 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; > }
On Tue, Sep 24, 2013 at 1:10 PM, <takasi-y@ops.dti.ne.jp> wrote: > 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> > --- > drivers/tty/serial/8250/8250_em.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) This looks fine to me, thanks! Acked-by: Magnus Damm <damm@opensource.se> -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }