summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-07-06 20:31:32 +0200
committerWolfram Sang <w.sang@pengutronix.de>2012-07-09 14:48:25 +0200
commit1f09c672314f8180113429ff36cad09296c40a9f (patch)
tree922763ea61609bd953b19e8cee3ff5372df2defb /drivers/i2c
parenti2c: stu300: use clk_prepare/unprepare (diff)
downloadlinux-1f09c672314f8180113429ff36cad09296c40a9f.tar.xz
linux-1f09c672314f8180113429ff36cad09296c40a9f.zip
i2c: i2c-imx: Adapt the clock name to the new clock framework
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@freescale.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> [wsa: rebased on top of the devm-conversion] Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index a93e84650f99..dd2a0839b266 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -514,7 +514,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
}
/* Get I2C clock */
- i2c_imx->clk = devm_clk_get(&pdev->dev, "i2c_clk");
+ i2c_imx->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(i2c_imx->clk)) {
dev_err(&pdev->dev, "can't get I2C clock\n");
return PTR_ERR(i2c_imx->clk);