From: Marc Dietrich Date: Sun, 19 Aug 2012 17:03:06 +0000 (+0200) Subject: staging: nvec: fix clock setup X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4344379f63d3bf16d4f2cb3d6b3f3be12704173f;p=openwrt%2Fstaging%2Fblogic.git staging: nvec: fix clock setup commit 30b68231 "ARM: tegra: clock: add i2c fast clock entry in clock table" added a new clock for the i2c controllers, so clock requests are no longer conclusive. Fix this by specifying "div-clk" explicitly. Signed-off-by: Marc Dietrich Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index fb52fe0d13ce..3e090ecc2eac 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -770,7 +770,7 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev) return -ENODEV; } - i2c_clk = clk_get_sys("tegra-i2c.2", NULL); + i2c_clk = clk_get_sys("tegra-i2c.2", "div-clk"); if (IS_ERR(i2c_clk)) { dev_err(nvec->dev, "failed to get controller clock\n"); return -ENODEV;