From f7adaff03ba1bab6570736eed02145d39326a276 Mon Sep 17 00:00:00 2001 From: Alex Frid Date: Wed, 14 Mar 2012 23:00:52 -0700 Subject: ARM: tegra: clock: Apply shared bus ceiling always Apply shared bus ceiling regardless of whether Tegra3 SHARED_CEILING user is enabled or disabled. Thus, we no longer need to enable ceiling user - and the bus itself via child-parent relations - to cap the bus rate. Bug 954896 Change-Id: I7f96f03f05fd39334c9ee977cd1ac18d86a1fc0d Signed-off-by: Alex Frid (cherry picked from commit 07b1a707aa14dcab37f095a3bb78af79a54c399b) Reviewed-on: http://git-master/r/95739 Reviewed-by: Daniel Solomon Tested-by: Daniel Solomon Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Yu-Huan Hsu --- arch/arm/mach-tegra/tegra3_dvfs.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'arch/arm/mach-tegra/tegra3_dvfs.c') diff --git a/arch/arm/mach-tegra/tegra3_dvfs.c b/arch/arm/mach-tegra/tegra3_dvfs.c index 48c4384b1aac..dcda3f3cae3b 100644 --- a/arch/arm/mach-tegra/tegra3_dvfs.c +++ b/arch/arm/mach-tegra/tegra3_dvfs.c @@ -783,19 +783,11 @@ static void core_cap_enable(bool enable) { int i; - if (enable) { + if (enable) tegra3_core_cap.refcnt++; - if (tegra3_core_cap.refcnt == 1) - for (i = 0; i < ARRAY_SIZE(core_cap_table); i++) - if (core_cap_table[i].cap_clk) - clk_enable(core_cap_table[i].cap_clk); - } else if (tegra3_core_cap.refcnt) { + else if (tegra3_core_cap.refcnt) tegra3_core_cap.refcnt--; - if (tegra3_core_cap.refcnt == 0) - for (i = ARRAY_SIZE(core_cap_table) - 1; i >= 0; i--) - if (core_cap_table[i].cap_clk) - clk_disable(core_cap_table[i].cap_clk); - } + core_cap_update(); } -- cgit v1.2.3