summaryrefslogtreecommitdiffstats
path: root/drivers/phy
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-28 09:32:39 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-28 09:32:39 -0700
commitce15bda101211dd0d42d6745f3998f87096b6f7c (patch)
treee1b85494740511c842e52eca1e5a5294d5bfed46 /drivers/phy
parent328fafb94fa136bfa19b4ebc54d1f8cfcad13801 (diff)
parent2a58f9c12bb360f38fb39e470bb5ff94014356e6 (diff)
downloadtalos-obmc-linux-ce15bda101211dd0d42d6745f3998f87096b6f7c.tar.gz
talos-obmc-linux-ce15bda101211dd0d42d6745f3998f87096b6f7c.zip
Merge tag 'usb-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes: usb: changes for v4.7 merge window Here's the big USB Gadget pull request. This time not as large as usual with only 57 non-merge commits. The most important part here is, again, all the work on dwc3. This time around we're treating all endpoints (except for control endpoint) exactly the same. They all have the same amount of TRBs on the ring, they all treat the ring as an actual ring with a link TRB pointing to the head, etc. We're also helping the host side burst (on SuperSpeed GEN1 or GEN2 at least) for as long as possible until the endpoint returns NRDY. Other than this big TRB ring rework on dwc3, we also have a dwc3-omap DMA initialization fix, some extra debugfs files to aid in some odd debug sessions and a complete removal of our FIFO resizing logic. We have a new quirk for some dwc3 P3 quirk in some implementations. The rest is basically non-critical fixes and the usual cleanups.
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 26566db09de0..e92b97cd6056 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -250,7 +250,8 @@ config PHY_SUN9I_USB
tristate "Allwinner sun9i SoC USB PHY driver"
depends on ARCH_SUNXI && HAS_IOMEM && OF
depends on RESET_CONTROLLER
- depends on USB_COMMON
+ depends on USB_SUPPORT
+ select USB_COMMON
select GENERIC_PHY
help
Enable this to support the transceiver that is part of Allwinner
OpenPOWER on IntegriCloud