diff options
| author | Peter Chen <peter.chen@freescale.com> | 2013-04-08 16:02:14 +0800 |
|---|---|---|
| committer | Peter Chen <peter.chen@freescale.com> | 2013-04-11 13:31:42 +0800 |
| commit | 33d6debf177157ec474c980cd0914e2faefedaf2 (patch) | |
| tree | 373f917096ed90989cc838e7d5475b965b588bdb | |
| parent | 03986279cfc4482b0e2dc578e65c6e78530455c2 (diff) | |
ENGR00257130-5 mx6sl: Add config for USB ID as system wakeup source
Since USB ID pin may affect power savings, we add enable/disable
USB ID pin as system wakeup source using Kconfig option, the user
can determine it.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6sl_common.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig index 6c7b690fe447..19d7c0f5253d 100644 --- a/arch/arm/mach-mx6/Kconfig +++ b/arch/arm/mach-mx6/Kconfig @@ -303,6 +303,11 @@ config USB_EHCI_ARC_H1 config USB_FSL_ARC_OTG tristate "FSL USB OTG support" +config USB_ID_WAKEUP_ENABLE + bool "Enable USB ID Pin As System Wakeup Source" + depends on SOC_IMX6SL + default n + config MX6_INTER_LDO_BYPASS bool "Internal LDO in MX6Q/DL bypass" depends on REGULATOR_PFUZE100 && CPU_FREQ_IMX && ARCH_MX6 diff --git a/arch/arm/mach-mx6/board-mx6sl_common.h b/arch/arm/mach-mx6/board-mx6sl_common.h index 2b2dd6b93c9a..897099f2c1ea 100644 --- a/arch/arm/mach-mx6/board-mx6sl_common.h +++ b/arch/arm/mach-mx6/board-mx6sl_common.h @@ -481,7 +481,9 @@ static iomux_v3_cfg_t suspend_enter_pads[] = { MX6SL_PAD_SD3_DAT3__GPIO_5_17, /* USBOTG ID pin */ +#ifndef CONFIG_USB_ID_WAKEUP_ENABLE MX6SL_PAD_EPDC_PWRCOM__GPIO_2_11, +#endif MX6SL_PAD_HSIC_STROBE__GPIO_3_20, MX6SL_PAD_HSIC_DAT__GPIO_3_19, |