diff options
| author | Bitan Biswas <bbiswas@nvidia.com> | 2013-05-14 20:42:49 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:28:15 -0700 |
| commit | 54ebd090401221703d34e3e34b2eb8c23ef683f7 (patch) | |
| tree | d97e0c618a0616030d600226004bc4296389d346 /arch/arm/mach-tegra/pm.h | |
| parent | d43c3a61d0ed1e86cd12e915b0279c527e0fbd0b (diff) | |
ARM: tegra: USB1 VBUS and ID ANY wake level support
This change enables wakeup from USB cable connect and disconnect
for both device(VBUS) and host(ID) cables.
- board platform data used to enable the implementation
- chip specific wakeups source file added with new API needed
to detect VBUS and ID cable connect state
- chip specific API exposed to return the USB1_VBUS and USB1_ID
wake indices
Moved dummy implementation of USB wake support APIs from chip-specific
source into common file
bug 1286802
bug 1314875
Change-Id: I59cfca82a907d33190a5bc92f33de5986fada43f
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-on: http://git-master/r/231918
(cherry picked from commit 75e8f1f218422013055c4fbcf96ceab059c933a7)
Reviewed-on: http://git-master/r/241033
(cherry picked from commit 3f65b627372c37b4726084bec1129b9b2dabfe4f)
Change-Id: Iae4db0cec2dbee6feef229b308b2b86340affd17
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-on: http://git-master/r/242383
(cherry picked from commit ba1bb5314fc5d877ab3bcd4e4530501e4f604dd4)
Reviewed-on: http://git-master/r/243438
(cherry picked from commit 7beaa748094e754c0bf7bd5f946c9a314949d2b9)
Reviewed-on: http://git-master/r/247106
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/pm.h')
| -rw-r--r-- | arch/arm/mach-tegra/pm.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h index 16ba8a493af4..247488378af5 100644 --- a/arch/arm/mach-tegra/pm.h +++ b/arch/arm/mach-tegra/pm.h @@ -2,20 +2,23 @@ * arch/arm/mach-tegra/include/mach/pm.h * * Copyright (C) 2010 Google, Inc. - * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. * * Author: * Colin Cross <ccross@google.com> * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. + * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -82,6 +85,8 @@ struct tegra_suspend_platform_data { unsigned long min_residency_crail; #endif unsigned long min_residency_mc_clk; + bool usb_vbus_internal_wake; /* support for internal vbus wake */ + bool usb_id_internal_wake; /* support for internal id wake */ }; /* clears io dpd settings before kernel code */ |