linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] i2c: i2c-imx: Adapt the clock name to the new clock framework
@ 2012-07-06 18:31 Fabio Estevam
       [not found] ` <1341599492-18212-1-git-send-email-fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2012-07-06 18:31 UTC (permalink / raw)
  Cc: wolfram-z923LK4zBo2bacvFa/9K2g, kernel-bIcnvbaLZ9MEGnE8C9+IrQ,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA, khali-PUYAD+kWke1g9hUCZPvPmw,
	ben-linux-elnMNo+KYs3YtjvyW6yDsg, Fabio Estevam

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

clk_register_clkdev(clk[i2c1_ipg_gate], NULL, "imx-i2c.0")

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

Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
 drivers/i2c/busses/i2c-imx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 370031a..a8709b1 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -528,7 +528,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
 	}
 
 	/* Get I2C clock */
-	i2c_imx->clk = clk_get(&pdev->dev, "i2c_clk");
+	i2c_imx->clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(i2c_imx->clk)) {
 		ret = PTR_ERR(i2c_imx->clk);
 		dev_err(&pdev->dev, "can't get I2C clock\n");
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] i2c: i2c-imx: Adapt the clock name to the new clock framework
       [not found] ` <1341599492-18212-1-git-send-email-fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
@ 2012-07-09  7:36   ` Sascha Hauer
  2012-07-09 12:50   ` Wolfram Sang
  1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2012-07-09  7:36 UTC (permalink / raw)
  To: Fabio Estevam
  Cc: wolfram-z923LK4zBo2bacvFa/9K2g, kernel-bIcnvbaLZ9MEGnE8C9+IrQ,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA, khali-PUYAD+kWke1g9hUCZPvPmw,
	ben-linux-elnMNo+KYs3YtjvyW6yDsg

On Fri, Jul 06, 2012 at 03:31:32PM -0300, Fabio Estevam wrote:
> With the new i.mx clock framework the i2c clock is registered as:
> 
> clk_register_clkdev(clk[i2c1_ipg_gate], NULL, "imx-i2c.0")
> 
> So we do not need to pass "i2c_clk" string and can use NULL instead.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>

Acked-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>

Sascha

> ---
>  drivers/i2c/busses/i2c-imx.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
> index 370031a..a8709b1 100644
> --- a/drivers/i2c/busses/i2c-imx.c
> +++ b/drivers/i2c/busses/i2c-imx.c
> @@ -528,7 +528,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
>  	}
>  
>  	/* Get I2C clock */
> -	i2c_imx->clk = clk_get(&pdev->dev, "i2c_clk");
> +	i2c_imx->clk = clk_get(&pdev->dev, NULL);
>  	if (IS_ERR(i2c_imx->clk)) {
>  		ret = PTR_ERR(i2c_imx->clk);
>  		dev_err(&pdev->dev, "can't get I2C clock\n");
> -- 
> 1.7.1
> 
> 

-- 
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 |

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] i2c: i2c-imx: Adapt the clock name to the new clock framework
       [not found] ` <1341599492-18212-1-git-send-email-fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
  2012-07-09  7:36   ` Sascha Hauer
@ 2012-07-09 12:50   ` Wolfram Sang
  1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2012-07-09 12:50 UTC (permalink / raw)
  To: Fabio Estevam
  Cc: wolfram-z923LK4zBo2bacvFa/9K2g, kernel-bIcnvbaLZ9MEGnE8C9+IrQ,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA, khali-PUYAD+kWke1g9hUCZPvPmw,
	ben-linux-elnMNo+KYs3YtjvyW6yDsg

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

On Fri, Jul 06, 2012 at 03:31:32PM -0300, Fabio Estevam wrote:
> With the new i.mx clock framework the i2c clock is registered as:
> 
> clk_register_clkdev(clk[i2c1_ipg_gate], NULL, "imx-i2c.0")
> 
> So we do not need to pass "i2c_clk" string and can use NULL instead.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>

Applied to next after fixing it up because we now use devm.

Thanks!

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-07-09 12:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-06 18:31 [PATCH] i2c: i2c-imx: Adapt the clock name to the new clock framework Fabio Estevam
     [not found] ` <1341599492-18212-1-git-send-email-fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2012-07-09  7:36   ` Sascha Hauer
2012-07-09 12:50   ` Wolfram Sang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).