[PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[Fabio Estevam]

With the new i.mx clock framework the mxc_w1 clock is registered as:

clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0"

So we do not need to pass "owire" string and can use NULL instead.

While at it, also fix the clock error handling code.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
-----
Changes since v1:
- Fix clock error handling
 drivers/w1/masters/mxc_w1.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 1cc61a7..960b362 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -117,11 +117,11 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
 	if (!mdev)
 		return -ENOMEM;
 
-	mdev->clk = clk_get(&pdev->dev, "owire");
-	if (!mdev->clk) {
-		err = -ENODEV;
-		goto failed_clk;
-	}
+	mdev->clk = clk_get(&pdev->dev, NULL);
+	if (IS_ERR(mdev->clk)) {
+		err = PTR_ERR(mdev->clk);
+		goto failed_clk;
+	}
 
 	mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
 
-- 
1.7.9.5

Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[Fabio Estevam]

Evgeny,

Any comments, please?


Fabio Estevam wrote:
> With the new i.mx clock framework the mxc_w1 clock is registered as:
> 
> clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0"
> 
> So we do not need to pass "owire" string and can use NULL instead.
> 
> While at it, also fix the clock error handling code.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> -----
> Changes since v1:
> - Fix clock error handling
>  drivers/w1/masters/mxc_w1.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
> index 1cc61a7..960b362 100644
> --- a/drivers/w1/masters/mxc_w1.c
> +++ b/drivers/w1/masters/mxc_w1.c
> @@ -117,11 +117,11 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
>  	if (!mdev)
>  		return -ENOMEM;
>  
> -	mdev->clk = clk_get(&pdev->dev, "owire");
> -	if (!mdev->clk) {
> -		err = -ENODEV;
> -		goto failed_clk;
> -	}
> +	mdev->clk = clk_get(&pdev->dev, NULL);
> +	if (IS_ERR(mdev->clk)) {
> +		err = PTR_ERR(mdev->clk);
> +		goto failed_clk;
> +	}
>  
>  	mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
>  

Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[Evgeniy Polyakov]

On Mon, Oct 01, 2012 at 02:51:44PM -0300, Fabio Estevam (fabio.estevam@freescale.com) wrote:
> Evgeny,
> 
> Any comments, please?

I have no objections per se, but I'm hardly an expert in imx clock
framework :)

Since it is only one patch in set of 3, I suppose it will be pushed
through different tree than w1. Feel free to add my ack.

Acked-by: Evgeniy Polyakov <zbr@ioremap.net>

-- 
	Evgeniy Polyakov

Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[Fabio Estevam]

Sascha,

On Tue, Oct 2, 2012 at 2:32 AM, Evgeniy Polyakov <zbr@ioremap.net> wrote:
> On Mon, Oct 01, 2012 at 02:51:44PM -0300, Fabio Estevam (fabio.estevam@freescale.com) wrote:
>> Evgeny,
>>
>> Any comments, please?
>
> I have no objections per se, but I'm hardly an expert in imx clock
> framework :)
>
> Since it is only one patch in set of 3, I suppose it will be pushed
> through different tree than w1. Feel free to add my ack.
>
> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>

Could this series go via your tree?

Regards,

Fabio Estevam

Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[Evgeniy Polyakov]

On Tue, Oct 02, 2012 at 10:04:19PM -0300, Fabio Estevam (festevam@gmail.com) wrote:
> > I have no objections per se, but I'm hardly an expert in imx clock
> > framework :)
> >
> > Since it is only one patch in set of 3, I suppose it will be pushed
> > through different tree than w1. Feel free to add my ack.
> >
> > Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
> 
> Could this series go via your tree?

Please send it to Greg (added to CC), but I would like someone who knows
this platform (and not only w1 bits, which look good) to acknowledge changes,
feel free to add mine.

-- 
	Evgeniy Polyakov

Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[Sascha Hauer]

On Thu, Sep 06, 2012 at 01:48:59PM -0300, Fabio Estevam wrote:
> With the new i.mx clock framework the mxc_w1 clock is registered as:
> 
> clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0"
> 
> So we do not need to pass "owire" string and can use NULL instead.
> 
> While at it, also fix the clock error handling code.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

> -----
> Changes since v1:
> - Fix clock error handling
>  drivers/w1/masters/mxc_w1.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
> index 1cc61a7..960b362 100644
> --- a/drivers/w1/masters/mxc_w1.c
> +++ b/drivers/w1/masters/mxc_w1.c
> @@ -117,11 +117,11 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
>  	if (!mdev)
>  		return -ENOMEM;
>  
> -	mdev->clk = clk_get(&pdev->dev, "owire");
> -	if (!mdev->clk) {
> -		err = -ENODEV;
> -		goto failed_clk;
> -	}
> +	mdev->clk = clk_get(&pdev->dev, NULL);
> +	if (IS_ERR(mdev->clk)) {
> +		err = PTR_ERR(mdev->clk);
> +		goto failed_clk;
> +	}
>  
>  	mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
>  
> -- 
> 1.7.9.5
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[Fabio Estevam]

Hi Sascha,

On Wed, Oct 3, 2012 at 4:28 AM, Evgeniy Polyakov <zbr@ioremap.net> wrote:
> On Tue, Oct 02, 2012 at 10:04:19PM -0300, Fabio Estevam (festevam@gmail.com) wrote:
>> > I have no objections per se, but I'm hardly an expert in imx clock
>> > framework :)
>> >
>> > Since it is only one patch in set of 3, I suppose it will be pushed
>> > through different tree than w1. Feel free to add my ack.
>> >
>> > Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
>>
>> Could this series go via your tree?
>
> Please send it to Greg (added to CC), but I would like someone who knows
> this platform (and not only w1 bits, which look good) to acknowledge changes,
> feel free to add mine.

Could you please ack this series?

Greg,

Should I re-send the patches with  Evgeniy and Sascha's acks?

Thanks,

Fabio Estevam

Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[GregKH]

On Sun, Nov 18, 2012 at 11:56:13PM -0200, Fabio Estevam wrote:
> Hi Sascha,
> 
> On Wed, Oct 3, 2012 at 4:28 AM, Evgeniy Polyakov <zbr@ioremap.net> wrote:
> > On Tue, Oct 02, 2012 at 10:04:19PM -0300, Fabio Estevam (festevam@gmail.com) wrote:
> >> > I have no objections per se, but I'm hardly an expert in imx clock
> >> > framework :)
> >> >
> >> > Since it is only one patch in set of 3, I suppose it will be pushed
> >> > through different tree than w1. Feel free to add my ack.
> >> >
> >> > Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
> >>
> >> Could this series go via your tree?
> >
> > Please send it to Greg (added to CC), but I would like someone who knows
> > this platform (and not only w1 bits, which look good) to acknowledge changes,
> > feel free to add mine.
> 
> Could you please ack this series?
> 
> Greg,
> 
> Should I re-send the patches with  Evgeniy and Sascha's acks?

Please do so, so that I can apply them to my tree.

thanks,

greg k-h

Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework

[Sascha Hauer]

On Thu, Sep 06, 2012 at 01:48:59PM -0300, Fabio Estevam wrote:
> With the new i.mx clock framework the mxc_w1 clock is registered as:
> 
> clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0"
> 
> So we do not need to pass "owire" string and can use NULL instead.
> 
> While at it, also fix the clock error handling code.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

SAscha

> -----
> Changes since v1:
> - Fix clock error handling
>  drivers/w1/masters/mxc_w1.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
> index 1cc61a7..960b362 100644
> --- a/drivers/w1/masters/mxc_w1.c
> +++ b/drivers/w1/masters/mxc_w1.c
> @@ -117,11 +117,11 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
>  	if (!mdev)
>  		return -ENOMEM;
>  
> -	mdev->clk = clk_get(&pdev->dev, "owire");
> -	if (!mdev->clk) {
> -		err = -ENODEV;
> -		goto failed_clk;
> -	}
> +	mdev->clk = clk_get(&pdev->dev, NULL);
> +	if (IS_ERR(mdev->clk)) {
> +		err = PTR_ERR(mdev->clk);
> +		goto failed_clk;
> +	}
>  
>  	mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
>  
> -- 
> 1.7.9.5
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |