Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / drivers / usb / phy / Kconfig

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 7ef3eb8617a6c7adc7775bc76a5fb0fd3d699ef8..3312ad2bb67f793afa629189f43919360b83d1c2 100644 (file)
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -4,11 +4,25 @@
 menuconfig USB_PHY
        bool "USB Physical Layer drivers"
        help
-         USB controllers (those which are host, device or DRD) need a
-         device to handle the physical layer signalling, commonly called
-         a PHY.
+         Most USB controllers have the physical layer signalling part
+         (commonly called a PHY) built in.  However, dual-role devices
+         (a.k.a. USB on-the-go) which support being USB master or slave
+         with the same connector often use an external PHY.
 
-         The following drivers add support for such PHY devices.
+         The drivers in this submenu add support for such PHY devices.
+         They are not needed for standard master-only (or the vast
+         majority of slave-only) USB interfaces.
+
+         If you're not sure if this applies to you, it probably doesn't;
+         say N here.
+
+config USB_OTG_WAKELOCK
+       bool "Hold a wakelock when USB connected"
+       depends on WAKELOCK
+       select USB_OTG_UTILS
+       help
+         Select this to automatically hold a wakelock when USB is
+         connected, preventing suspend.
 
 if USB_PHY