diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 11:28:21 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 11:28:21 +0900 |
| commit | f8712528ae0bfef50f30b1da3d58e22f4f007889 (patch) | |
| tree | 77dffd5ac91fd75f5e87595adb31176fd2bf3f11 /drivers/usb/phy/Kconfig | |
| parent | c311e391a7efd101250c0e123286709b7e736249 (diff) | |
| parent | 7751b6fb05869bcb318e74420148c06577adf894 (diff) | |
| download | blackbird-op-linux-f8712528ae0bfef50f30b1da3d58e22f4f007889.tar.gz blackbird-op-linux-f8712528ae0bfef50f30b1da3d58e22f4f007889.zip | |
Merge tag 'usb-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v3.16 merge window
Not a lot here during this merge window. Mostly we just have
the usual miscellaneous patches (removal of unnecessary prints,
proper dependencies being added to Kconfig, build warning fixes,
new device ID, etc.
Other than those, the only important new features are the
new support for OS Strings which should help Linux Gadget
Drivers behave better under MS Windows. Also Babble Recovery
implementation for MUSB on AM335x. Lastly, we also have
ARCH_QCOM PHY support though phy-msm.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c
Diffstat (limited to 'drivers/usb/phy/Kconfig')
| -rw-r--r-- | drivers/usb/phy/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index 33dd6a6c320a..adccdeb996d9 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -163,11 +163,12 @@ config USB_ISP1301 module will be called phy-isp1301. config USB_MSM_OTG - tristate "OTG support for Qualcomm on-chip USB controller" - depends on (USB || USB_GADGET) && ARCH_MSM + tristate "Qualcomm on-chip USB OTG controller support" + depends on (USB || USB_GADGET) && (ARCH_MSM || ARCH_QCOM || COMPILE_TEST) + depends on RESET_CONTROLLER select USB_PHY help - Enable this to support the USB OTG transceiver on MSM chips. It + Enable this to support the USB OTG transceiver on Qualcomm chips. It handles PHY initialization, clock management, and workarounds required after resetting the hardware and power management. This driver is required even for peripheral only or host only |
