diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 19:30:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 19:30:55 -0700 |
commit | 362f6729cbb1d6bbab59e069f19441b0622ff7ec (patch) | |
tree | 654070221092c34c97f48fbbdef7d5f02ffc7ba4 /drivers | |
parent | 4422d80ed7d4bdb2d6e9fb890c66c3d9250ba694 (diff) | |
parent | 6836796de4019944f4ba4c99a360e8250fd2e735 (diff) |
Merge tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB/PHY updates from Greg KH:
"Here is the big patchset of USB and PHY driver updates for 4.13-rc1.
On the PHY side, they decided to move files around to "make things
easier" in their tree. Hopefully that wasn't a mistake, but in
linux-next testing, we haven't had any reported problems.
There's the usual set of gadget and xhci and musb updates in here as
well, along with a number of smaller updates for a raft of different
USB drivers. Full details in the shortlog, nothing really major.
All of these have been in linux-next for a while with no reported
issues"
* tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (173 commits)
Add USB quirk for HVR-950q to avoid intermittent device resets
USB hub_probe: rework ugly goto-into-compound-statement
usb: host: ohci-pxa27x: Handle return value of clk_prepare_enable
USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick
usbip: Fix uninitialized variable bug in vhci
usb: core: read USB ports from DT in the usbport LED trigger driver
dt-bindings: leds: document new trigger-sources property
usb: typec: ucsi: Add ACPI driver
usb: typec: Add support for UCSI interface
usb: musb: compress return logic into one line
USB: serial: propagate late probe errors
USB: serial: refactor port endpoint setup
usb: musb: tusb6010_omap: Convert to DMAengine API
ARM: OMAP2+: DMA: Add slave map entries for 24xx external request lines
usb: musb: tusb6010: Handle DMA TX completion in DMA callback as well
usb: musb: tusb6010_omap: Allocate DMA channels upfront
usb: musb: tusb6010_omap: Create new struct for DMA data/parameters
usb: musb: tusb6010_omap: Use one musb_ep_select call in tusb_omap_dma_program
usb: musb: tusb6010: Add MUSB_G_NO_SKB_RESERVE to quirks
usb: musb: Add quirk to avoid skb reserve in gadget mode
...
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/core.c | 16 | ||||
-rw-r--r-- | drivers/base/pinctrl.c | 3 | ||||
-rw-r--r-- | drivers/dma/omap-dma.c | 39 | ||||
-rw-r--r-- | drivers/extcon/Kconfig | 1 | ||||
-rw-r--r-- | drivers/extcon/extcon-arizona.c | 4 | ||||
-rw-r--r-- | drivers/extcon/extcon-intel-int3496.c | 5 | ||||
-rw-r--r-- | drivers/extcon/extcon.c | 11 | ||||
-rw-r--r-- | drivers/phy/Kconfig | 492 | ||||
-rw-r--r-- | drivers/phy/Makefile | 71 | ||||
-rw-r--r-- | drivers/phy/allwinner/Kconfig | 31 | ||||
-rw-r--r-- | drivers/phy/allwinner/Makefile | 2 | ||||
-rw-r--r-- | drivers/phy/allwinner/phy-sun4i-usb.c (renamed from drivers/phy/phy-sun4i-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/allwinner/phy-sun9i-usb.c (renamed from drivers/phy/phy-sun9i-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/amlogic/Kconfig | 27 | ||||
-rw-r--r-- | drivers/phy/amlogic/Makefile | 2 | ||||
-rw-r--r-- | drivers/phy/amlogic/phy-meson-gxl-usb2.c | 273 | ||||
-rw-r--r-- | drivers/phy/amlogic/phy-meson8b-usb2.c (renamed from drivers/phy/phy-meson8b-usb2.c) | 5 | ||||
-rw-r--r-- | drivers/phy/broadcom/Kconfig | 69 | ||||
-rw-r--r-- | drivers/phy/broadcom/Makefile | 7 | ||||
-rw-r--r-- | drivers/phy/broadcom/phy-bcm-cygnus-pcie.c (renamed from drivers/phy/phy-bcm-cygnus-pcie.c) | 0 | ||||
-rw-r--r-- | drivers/phy/broadcom/phy-bcm-kona-usb2.c (renamed from drivers/phy/phy-bcm-kona-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/broadcom/phy-bcm-ns-usb2.c (renamed from drivers/phy/phy-bcm-ns-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/broadcom/phy-bcm-ns-usb3.c (renamed from drivers/phy/phy-bcm-ns-usb3.c) | 230 | ||||
-rw-r--r-- | drivers/phy/broadcom/phy-bcm-ns2-pcie.c (renamed from drivers/phy/phy-bcm-ns2-pcie.c) | 0 | ||||
-rw-r--r-- | drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 437 | ||||
-rw-r--r-- | drivers/phy/broadcom/phy-brcm-sata.c (renamed from drivers/phy/phy-brcm-sata.c) | 73 | ||||
-rw-r--r-- | drivers/phy/hisilicon/Kconfig | 20 | ||||
-rw-r--r-- | drivers/phy/hisilicon/Makefile | 2 | ||||
-rw-r--r-- | drivers/phy/hisilicon/phy-hi6220-usb.c (renamed from drivers/phy/phy-hi6220-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/hisilicon/phy-hix5hd2-sata.c (renamed from drivers/phy/phy-hix5hd2-sata.c) | 0 | ||||
-rw-r--r-- | drivers/phy/marvell/Kconfig | 50 | ||||
-rw-r--r-- | drivers/phy/marvell/Makefile | 6 | ||||
-rw-r--r-- | drivers/phy/marvell/phy-armada375-usb2.c (renamed from drivers/phy/phy-armada375-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/marvell/phy-berlin-sata.c (renamed from drivers/phy/phy-berlin-sata.c) | 0 | ||||
-rw-r--r-- | drivers/phy/marvell/phy-berlin-usb.c (renamed from drivers/phy/phy-berlin-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/marvell/phy-mvebu-sata.c (renamed from drivers/phy/phy-mvebu-sata.c) | 0 | ||||
-rw-r--r-- | drivers/phy/marvell/phy-pxa-28nm-hsic.c (renamed from drivers/phy/phy-pxa-28nm-hsic.c) | 0 | ||||
-rw-r--r-- | drivers/phy/marvell/phy-pxa-28nm-usb2.c (renamed from drivers/phy/phy-pxa-28nm-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/motorola/Kconfig | 12 | ||||
-rw-r--r-- | drivers/phy/motorola/Makefile | 5 | ||||
-rw-r--r-- | drivers/phy/motorola/phy-cpcap-usb.c | 676 | ||||
-rw-r--r-- | drivers/phy/qualcomm/Kconfig | 58 | ||||
-rw-r--r-- | drivers/phy/qualcomm/Makefile | 9 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-apq8064-sata.c (renamed from drivers/phy/phy-qcom-apq8064-sata.c) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c (renamed from drivers/phy/phy-qcom-ipq806x-sata.c) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-qmp.c (renamed from drivers/phy/phy-qcom-qmp.c) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-qusb2.c (renamed from drivers/phy/phy-qcom-qusb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-ufs-i.h (renamed from drivers/phy/phy-qcom-ufs-i.h) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c (renamed from drivers/phy/phy-qcom-ufs-qmp-14nm.c) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.h (renamed from drivers/phy/phy-qcom-ufs-qmp-14nm.h) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c (renamed from drivers/phy/phy-qcom-ufs-qmp-20nm.c) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.h (renamed from drivers/phy/phy-qcom-ufs-qmp-20nm.h) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-ufs.c (renamed from drivers/phy/phy-qcom-ufs.c) | 0 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-usb-hs.c (renamed from drivers/phy/phy-qcom-usb-hs.c) | 3 | ||||
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-usb-hsic.c (renamed from drivers/phy/phy-qcom-usb-hsic.c) | 3 | ||||
-rw-r--r-- | drivers/phy/renesas/Kconfig | 24 | ||||
-rw-r--r-- | drivers/phy/renesas/Makefile | 3 | ||||
-rw-r--r-- | drivers/phy/renesas/phy-rcar-gen2.c (renamed from drivers/phy/phy-rcar-gen2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/renesas/phy-rcar-gen3-usb2.c (renamed from drivers/phy/phy-rcar-gen3-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/renesas/phy-rcar-gen3-usb3.c | 226 | ||||
-rw-r--r-- | drivers/phy/rockchip/Kconfig | 51 | ||||
-rw-r--r-- | drivers/phy/rockchip/Makefile | 6 | ||||
-rw-r--r-- | drivers/phy/rockchip/phy-rockchip-dp.c (renamed from drivers/phy/phy-rockchip-dp.c) | 0 | ||||
-rw-r--r-- | drivers/phy/rockchip/phy-rockchip-emmc.c (renamed from drivers/phy/phy-rockchip-emmc.c) | 0 | ||||
-rw-r--r-- | drivers/phy/rockchip/phy-rockchip-inno-usb2.c (renamed from drivers/phy/phy-rockchip-inno-usb2.c) | 74 | ||||
-rw-r--r-- | drivers/phy/rockchip/phy-rockchip-pcie.c (renamed from drivers/phy/phy-rockchip-pcie.c) | 0 | ||||
-rw-r--r-- | drivers/phy/rockchip/phy-rockchip-typec.c (renamed from drivers/phy/phy-rockchip-typec.c) | 0 | ||||
-rw-r--r-- | drivers/phy/rockchip/phy-rockchip-usb.c (renamed from drivers/phy/phy-rockchip-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/Kconfig | 95 | ||||
-rw-r--r-- | drivers/phy/samsung/Makefile | 11 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-exynos-dp-video.c (renamed from drivers/phy/phy-exynos-dp-video.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-exynos-mipi-video.c (renamed from drivers/phy/phy-exynos-mipi-video.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-exynos-pcie.c (renamed from drivers/phy/phy-exynos-pcie.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-exynos4210-usb2.c (renamed from drivers/phy/phy-exynos4210-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-exynos4x12-usb2.c (renamed from drivers/phy/phy-exynos4x12-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-exynos5-usbdrd.c (renamed from drivers/phy/phy-exynos5-usbdrd.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-exynos5250-sata.c (renamed from drivers/phy/phy-exynos5250-sata.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-exynos5250-usb2.c (renamed from drivers/phy/phy-exynos5250-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-s5pv210-usb2.c (renamed from drivers/phy/phy-s5pv210-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-samsung-usb2.c (renamed from drivers/phy/phy-samsung-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/samsung/phy-samsung-usb2.h (renamed from drivers/phy/phy-samsung-usb2.h) | 0 | ||||
-rw-r--r-- | drivers/phy/st/Kconfig | 33 | ||||
-rw-r--r-- | drivers/phy/st/Makefile | 4 | ||||
-rw-r--r-- | drivers/phy/st/phy-miphy28lp.c (renamed from drivers/phy/phy-miphy28lp.c) | 0 | ||||
-rw-r--r-- | drivers/phy/st/phy-spear1310-miphy.c (renamed from drivers/phy/phy-spear1310-miphy.c) | 0 | ||||
-rw-r--r-- | drivers/phy/st/phy-spear1340-miphy.c (renamed from drivers/phy/phy-spear1340-miphy.c) | 0 | ||||
-rw-r--r-- | drivers/phy/st/phy-stih407-usb.c (renamed from drivers/phy/phy-stih407-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/ti/Kconfig | 78 | ||||
-rw-r--r-- | drivers/phy/ti/Makefile | 7 | ||||
-rw-r--r-- | drivers/phy/ti/phy-da8xx-usb.c (renamed from drivers/phy/phy-da8xx-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/ti/phy-dm816x-usb.c (renamed from drivers/phy/phy-dm816x-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/ti/phy-omap-control.c (renamed from drivers/phy/phy-omap-control.c) | 0 | ||||
-rw-r--r-- | drivers/phy/ti/phy-omap-usb2.c (renamed from drivers/phy/phy-omap-usb2.c) | 0 | ||||
-rw-r--r-- | drivers/phy/ti/phy-ti-pipe3.c (renamed from drivers/phy/phy-ti-pipe3.c) | 0 | ||||
-rw-r--r-- | drivers/phy/ti/phy-tusb1210.c (renamed from drivers/phy/phy-tusb1210.c) | 41 | ||||
-rw-r--r-- | drivers/phy/ti/phy-twl4030-usb.c (renamed from drivers/phy/phy-twl4030-usb.c) | 0 | ||||
-rw-r--r-- | drivers/phy/ulpi_phy.h | 31 | ||||
-rw-r--r-- | drivers/thermal/max77620_thermal.c | 8 | ||||
-rw-r--r-- | drivers/usb/chipidea/core.c | 29 | ||||
-rw-r--r-- | drivers/usb/chipidea/otg_fsm.c | 8 | ||||
-rw-r--r-- | drivers/usb/class/cdc-wdm.c | 17 | ||||
-rw-r--r-- | drivers/usb/core/devio.c | 3 | ||||
-rw-r--r-- | drivers/usb/core/hcd.c | 14 | ||||
-rw-r--r-- | drivers/usb/core/hub.c | 51 | ||||
-rw-r--r-- | drivers/usb/core/ledtrig-usbport.c | 56 | ||||
-rw-r--r-- | drivers/usb/core/of.c | 3 | ||||
-rw-r--r-- | drivers/usb/core/quirks.c | 4 | ||||
-rw-r--r-- | drivers/usb/core/usb-acpi.c | 26 | ||||
-rw-r--r-- | drivers/usb/core/usb.c | 2 | ||||
-rw-r--r-- | drivers/usb/dwc3/core.c | 57 | ||||
-rw-r--r-- | drivers/usb/dwc3/core.h | 48 | ||||
-rw-r--r-- | drivers/usb/dwc3/debug.h | 247 | ||||
-rw-r--r-- | drivers/usb/dwc3/debugfs.c | 9 | ||||
-rw-r--r-- | drivers/usb/dwc3/dwc3-exynos.c | 13 | ||||
-rw-r--r-- | drivers/usb/dwc3/dwc3-st.c | 2 | ||||
-rw-r--r-- | drivers/usb/dwc3/ep0.c | 8 | ||||
-rw-r--r-- | drivers/usb/dwc3/gadget.c | 299 | ||||
-rw-r--r-- | drivers/usb/dwc3/gadget.h | 22 | ||||
-rw-r--r-- | drivers/usb/dwc3/trace.h | 28 | ||||
-rw-r--r-- | drivers/usb/dwc3/ulpi.c | 12 | ||||
-rw-r--r-- | drivers/usb/early/xhci-dbc.c | 1 | ||||
-rw-r--r-- | drivers/usb/gadget/Kconfig | 31 | ||||
-rw-r--r-- | drivers/usb/gadget/composite.c | 59 | ||||
-rw-r--r-- | drivers/usb/gadget/configfs.c | 14 | ||||
-rw-r--r-- | drivers/usb/gadget/function/Makefile | 5 | ||||
-rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 110 | ||||
-rw-r--r-- | drivers/usb/gadget/function/f_mass_storage.c | 430 | ||||
-rw-r--r-- | drivers/usb/gadget/function/f_uac1.c | 896 | ||||
-rw-r--r-- | drivers/usb/gadget/function/f_uac1_legacy.c | 1021 | ||||
-rw-r--r-- | drivers/usb/gadget/function/f_uac2.c | 807 |