diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:07:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:07:36 +0200 |
| commit | 1194b152cd4eff475652785ce366b20afe82dfcf (patch) | |
| tree | 78da3848410f05949714b2e475d4cf92b463fb31 /drivers/clocksource | |
| parent | 86feb64f5bfe75da74f4a2faf18b5e57be9cde5e (diff) | |
| parent | 38be85de698ef3f2755ee0eabf520530757860aa (diff) | |
| download | op-kernel-dev-1194b152cd4eff475652785ce366b20afe82dfcf.zip op-kernel-dev-1194b152cd4eff475652785ce366b20afe82dfcf.tar.gz | |
Merge branch 'tegra/soc' into next/drivers
This is a dependency for the tegra/clk branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/tegra20_timer.c
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/tegra20_timer.c | 4 |
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 |
