From bab0af42c1d2b7d11cfd22f0b8d29a806608f89c Mon Sep 17 00:00:00 2001
From: Prashant Gaikwad <pgaikwad@nvidia.com>
Date: Fri, 11 Jan 2013 13:31:24 +0530
Subject: [PATCH] --- yaml --- r: 355551 b: refs/heads/master c:
 1e54f0a21e7debcd8acb0fe39adc6f81751e1b57 h: refs/heads/master i:   355549:
 78df4b96aac55a7d311fc962dfe378cf4a862983   355547:
 52ac9e6cc07791f557f4f8e087f62bf7d1cf34d9   355543:
 aac0ca4894232673157e144270f5de1df240078a   355535:
 13974a840f35ffcdb0545b0066db1d2247bcbb07   355519:
 a19353c9604a815f44ebd6f86a5ad02e104eef18 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/staging/nvec/TODO   | 4 ----
 trunk/drivers/staging/nvec/nvec.c | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b76cde60c860..5179e39e1ba6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d409b3af89e93f1e08acf157126fc77188e2b89c
+refs/heads/master: 1e54f0a21e7debcd8acb0fe39adc6f81751e1b57
diff --git a/trunk/drivers/staging/nvec/TODO b/trunk/drivers/staging/nvec/TODO
index f950ab890e2e..e5ae42a0b44a 100644
--- a/trunk/drivers/staging/nvec/TODO
+++ b/trunk/drivers/staging/nvec/TODO
@@ -1,9 +1,5 @@
 ToDo list (incomplete, unordered)
 	- add compile as module support
-	- fix clk usage
-	  should not be using clk_get_sys(), but clk_get(&pdev->dev, conn)
-	  where conn is either NULL if the device only has one clock, or
-	  the device specific name if it has multiple clocks.
 	- move half of the nvec init stuff to i2c-tegra.c
 	- move event handling to nvec_events
 	- finish suspend/resume support
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
index d51615b19797..9417941974f7 100644
--- a/trunk/drivers/staging/nvec/nvec.c
+++ b/trunk/drivers/staging/nvec/nvec.c
@@ -770,7 +770,7 @@ static int tegra_nvec_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	i2c_clk = clk_get_sys("tegra-i2c.2", "div-clk");
+	i2c_clk = clk_get(&pdev->dev, "div-clk");
 	if (IS_ERR(i2c_clk)) {
 		dev_err(nvec->dev, "failed to get controller clock\n");
 		return -ENODEV;