From 1ed0961122af7753b557a46ede66e4e78c71138a Mon Sep 17 00:00:00 2001 From: Alex Frid Date: Tue, 27 Mar 2012 12:19:52 -0700 Subject: ARM: tegra: power: Don't enable auto-hotplug as PM QoS side-effect On Tegra3, if PM QoS hotplug request is received when auto-hotplug is disabled, do not enable auto-hotplug as side effect of the request. Change-Id: I8928d9ecd22e2d2df5fe60274fed30da0c565b47 Signed-off-by: Alex Frid Reviewed-on: http://git-master/r/102118 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Donghan Ryu Reviewed-by: Diwakar Tundlam --- arch/arm/mach-tegra/cpu-tegra3.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'arch/arm/mach-tegra/cpu-tegra3.c') diff --git a/arch/arm/mach-tegra/cpu-tegra3.c b/arch/arm/mach-tegra/cpu-tegra3.c index 374a27156f02..86a0b1364b3d 100644 --- a/arch/arm/mach-tegra/cpu-tegra3.c +++ b/arch/arm/mach-tegra/cpu-tegra3.c @@ -327,7 +327,10 @@ void tegra_auto_hotplug_governor(unsigned int cpu_freq, bool suspend) if (!is_g_cluster_present()) return; - if (suspend && (hp_state != TEGRA_HP_DISABLED)) { + if (hp_state == TEGRA_HP_DISABLED) + return; + + if (suspend) { hp_state = TEGRA_HP_IDLE; /* Switch to G-mode if suspend rate is high enough */ @@ -360,8 +363,6 @@ void tegra_auto_hotplug_governor(unsigned int cpu_freq, bool suspend) } switch (hp_state) { - case TEGRA_HP_DISABLED: - break; case TEGRA_HP_IDLE: if (cpu_freq > top_freq) { hp_state = TEGRA_HP_UP; -- cgit v1.2.3