diff options
| author | Mayuresh Kulkarni <mkulkarni@nvidia.com> | 2010-04-28 17:19:11 +0530 |
|---|---|---|
| committer | Yu-Huan Hsu <yhsu@nvidia.com> | 2010-04-28 15:37:59 -0700 |
| commit | 4e3cd0fa570e74ee9a5c8b8c3bc33f3cc4e4f94e (patch) | |
| tree | 295f6549dff9d74be3dee69a9689519faaf8ab91 | |
| parent | f44dd57fc132e2e1df13855f01f486e8a67a1c40 (diff) | |
tegra harmony: remove the WAR added to turn on disaply after resume
When this code was written, we were not aware of how to turn on harmony's
display using a single key press. Also, after resume if none of the wake-locks
is acquired then system immediately goes to suspend.
To avoid this, we added this WAR to acquire a timed wake lock of 10 sec.
This gives the user a chance to either press a
key/insert-remove usb cable/insert-remove SD card after
which the display turns on.
Now that we have the way to turn on display by any press, this WAR is not
needed.
Tested on android + harmony (A02, R04 EC firmware) for LP0 and LP1.
For bug 680652 - [SW] Harmony specific suspend_ops implementation
Change-Id: I26492f01ed8cf07c5cf448c0e1f67dc99251aaf4
Reviewed-on: http://git-master/r/1236
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Tested-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Narendra Damahe <ndamahe@nvidia.com>
Tested-by: Narendra Damahe <ndamahe@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
| -rwxr-xr-x | arch/arm/mach-tegra/suspend_ops.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/mach-tegra/suspend_ops.c b/arch/arm/mach-tegra/suspend_ops.c index 8fd43b8947c5..0b1e64b7bffe 100755 --- a/arch/arm/mach-tegra/suspend_ops.c +++ b/arch/arm/mach-tegra/suspend_ops.c @@ -29,11 +29,6 @@ extern void cpu_ap20_do_lp0(void); extern void cpu_ap20_do_lp1(void); -#if defined(CONFIG_TEGRA_ODM_HARMONY) -static struct wake_lock suspend_ops_wake_lock; -static bool wake_lock_initialized = false; -#endif - int tegra_state_valid(suspend_state_t state) { if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX) @@ -61,22 +56,10 @@ int tegra_state_enter(suspend_state_t state) return 0; } -void tegra_state_end(void) -{ -#if defined(CONFIG_TEGRA_ODM_HARMONY) - if(!wake_lock_initialized) { - wake_lock_init(&suspend_ops_wake_lock, WAKE_LOCK_SUSPEND, "tegra_suspend_ops"); - wake_lock_initialized = true; - } - wake_lock_timeout(&suspend_ops_wake_lock, 1000); -#endif -} - static struct platform_suspend_ops tegra_suspend_ops = { .valid = tegra_state_valid, .enter = tegra_state_enter, - .end = tegra_state_end }; void tegra_set_suspend_ops(void) |