summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-09 16:54:27 +0200
committerArnd Bergmann <arnd@arndb.de>2013-04-09 16:54:27 +0200
commit3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64 (patch)
tree49bbe7b27f8571c7716e9cbc7fbbe462ea82077a /drivers/clocksource
parentd93bea007ab3d77b796eb99fb4ff4eeb013e0dfa (diff)
parent38be85de698ef3f2755ee0eabf520530757860aa (diff)
downloadop-kernel-dev-3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64.zip
op-kernel-dev-3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64.tar.gz
Merge branch 'tegra/soc' into next/multiplatform
This is a dependency for the tegra multiplatform series. Conflicts: drivers/clocksource/tegra20_timer.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/tegra20_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c
index 2e4d8a6..ae877b0 100644
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@ -172,7 +172,7 @@ static void __init tegra20_init_timer(struct device_node *np)
BUG();
}
- clk = clk_get_sys("timer", NULL);
+ clk = of_clk_get(np, 0);
if (IS_ERR(clk)) {
pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n");
rate = 12000000;
@@ -235,7 +235,7 @@ static void __init tegra20_init_rtc(struct device_node *np)
* rtc registers are used by read_persistent_clock, keep the rtc clock
* enabled
*/
- clk = clk_get_sys("rtc-tegra", NULL);
+ clk = of_clk_get(np, 0);
if (IS_ERR(clk))
pr_warn("Unable to get rtc-tegra clock\n");
else
OpenPOWER on IntegriCloud