diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-15 13:24:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-15 13:24:55 -0500 |
commit | e29876723f7cb7728f0d6a674d23f92673e9f112 (patch) | |
tree | ea1da8bf77139f6cc6de029988208a7eddaf2002 /drivers/phy/Kconfig | |
parent | 8c988ae787af4900bec5410658e8a82844185c85 (diff) | |
parent | 4d4bac4499e9955521af80198063ef9c2f2bd634 (diff) |
Merge tag 'usb-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB patches from Greg KH:
"Here's the big pull request for the USB driver tree for 3.20-rc1.
Nothing major happening here, just lots of gadget driver updates, new
device ids, and a bunch of cleanups.
All of these have been in linux-next for a while with no reported
issues"
* tag 'usb-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (299 commits)
usb: musb: fix device hotplug behind hub
usb: dwc2: Fix a bug in reading the endpoint directions from reg.
staging: emxx_udc: fix the build error
usb: Retry port status check on resume to work around RH bugs
Revert "usb: Reset USB-3 devices on USB-3 link bounce"
uhci-hub: use HUB_CHAR_*
usb: kconfig: replace PPC_OF with PPC
ehci-pci: disable for Intel MID platforms (update)
usb: gadget: Kconfig: use bool instead of boolean
usb: musb: blackfin: remove incorrect __exit_p()
USB: fix use-after-free bug in usb_hcd_unlink_urb()
ehci-pci: disable for Intel MID platforms
usb: host: pci_quirks: joing string literals
USB: add flag for HCDs that can't receive wakeup requests (isp1760-hcd)
USB: usbfs: allow URBs to be reaped after disconnection
cdc-acm: kill unnecessary messages
cdc-acm: add sanity checks
usb: phy: phy-generic: Fix USB PHY gpio reset
usb: dwc2: fix USB core dependencies
usb: renesas_usbhs: fix NULL pointer dereference in dma_release_channel()
...
Diffstat (limited to 'drivers/phy/Kconfig')
-rw-r--r-- | drivers/phy/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 26a7623e551e..2962de205ba7 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig | |||
@@ -239,6 +239,13 @@ config PHY_QCOM_IPQ806X_SATA | |||
239 | depends on OF | 239 | depends on OF |
240 | select GENERIC_PHY | 240 | select GENERIC_PHY |
241 | 241 | ||
242 | config PHY_ROCKCHIP_USB | ||
243 | tristate "Rockchip USB2 PHY Driver" | ||
244 | depends on ARCH_ROCKCHIP && OF | ||
245 | select GENERIC_PHY | ||
246 | help | ||
247 | Enable this to support the Rockchip USB 2.0 PHY. | ||
248 | |||
242 | config PHY_ST_SPEAR1310_MIPHY | 249 | config PHY_ST_SPEAR1310_MIPHY |
243 | tristate "ST SPEAR1310-MIPHY driver" | 250 | tristate "ST SPEAR1310-MIPHY driver" |
244 | select GENERIC_PHY | 251 | select GENERIC_PHY |