summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/tegra2_clocks.c
diff options
context:
space:
mode:
authorPrashant Gaikwad <pgaikwad@nvidia.com>2012-01-09 17:15:48 +0530
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-01-16 09:05:25 -0800
commit09187d2fc72797af9aff43db0942711744b88756 (patch)
treee3abfdb1c0d493e8da276f9c74f0ded05a0ecdfb /arch/arm/mach-tegra/tegra2_clocks.c
parent0dce7213008f114fc17f183f11b3cf19f270edac (diff)
ARM: Tegra2: clock: Update TWD rate with CPU rate
When CPU is clocked from backup PLL, TWD rate was not updated. Change-Id: I3ee1e210607393bfd06227adac46141b752768dc Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-on: http://git-master/r/74003 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com> Reviewed-on: http://git-master/r/75149 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/tegra2_clocks.c')
-rw-r--r--arch/arm/mach-tegra/tegra2_clocks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 91dd2b0d74cf..3b0b0a050254 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -468,13 +468,13 @@ static int tegra2_cpu_clk_set_rate(struct clk *c, unsigned long rate)
goto out;
}
+out:
/* We can't parent the twd to directly to the CPU complex because
the TWD frequency update notifier is called in an atomic context
and the CPU frequency update requires a mutex. Update the twd
clock rate with the new CPU complex rate. */
clk_set_rate(&tegra2_clk_twd, clk_get_rate_locked(c));
-out:
clk_disable(c->u.cpu.main);
return ret;
}