aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/nvec
diff options
context:
space:
mode:
authorMarc Dietrich <marvin24@gmx.de>2012-08-19 19:03:06 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-04 13:18:14 -0700
commit4344379f63d3bf16d4f2cb3d6b3f3be12704173f (patch)
treeaa7f4646a6512f17b9221411c8f1d69eeac37436 /drivers/staging/nvec
parent4f19b38f135aaf3c71198bb55cb7a88693a4ba00 (diff)
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 <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/nvec')
-rw-r--r--drivers/staging/nvec/nvec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index fb52fe0d13c..3e090ecc2ea 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;