Merge tag 'usb-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

ae9b475e · Linus Torvalds <[email protected]> · 2014-08-04 20:11:28 -07:00

Pull USB updates from Greg KH:
 "Here is the big USB driver update for 3.17-rc1.

  Loads of gadget driver changes in here, including some big file
  movements to make things easier to manage over time.  There's also the
  usual xhci and uas driver updates, and a handful of other changes in
  here.  The changelog has the full details.

  All of these have been in linux-next for a while"

* tag 'usb-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (211 commits)
  USB: devio: fix issue with log flooding
  uas: Log a warning when we cannot use uas because the hcd lacks streams
  uas: Only complain about missing sg if all other checks succeed
  xhci: Add missing checks for xhci_alloc_command failure
  xhci: Rename Asrock P67 pci product-id to EJ168
  xhci: Blacklist using streams on the Etron EJ168 controller
  uas: Limit qdepth to 32 when connected over usb-2
  uwb/whci: use correct structure type name in sizeof
  usb-core bInterval quirk
  USB: serial: ftdi_sio: Add support for new Xsens devices
  USB: serial: ftdi_sio: Annotate the current Xsens PID assignments
  usb: chipidea: debug: fix sparse non static symbol warnings
  usb: ci_hdrc_imx doc: fsl,usbphy is required
  usb: ci_hdrc_imx: Return -EINVAL for missing USB PHY
  usb: core: allow zero packet flag for interrupt urbs
  usb: lvstest: Fix sparse warnings generated by kbuild test bot
  USB: core: hcd-pci: free IRQ before disabling PCI device when shutting down
  phy: miphy365x: Represent each PHY channel as a DT subnode
  phy: miphy365x: Provide support for the MiPHY356x Generic PHY
  phy: miphy365x: Add Device Tree bindings for the MiPHY365x
  ...

Commit: ae9b475ebed96afe51d6bcf10dc7aee9c8d89ed7
Parents: 79eb238c · d310d05f

Merge commit. Changes below are compared with the first parent: 79eb238c.

Changes

266 files changed · +10990 −5590

File	Status	Add	Del	Content
Documentation/ABI/stable/sysfs-bus-usb	modified	+7	−7	View file
Documentation/ABI/testing/sysfs-bus-usb-lvstest	added	+47	−0	View file
Documentation/DocBook/gadget.tmpl	modified	+5	−5	View file
Documentation/devicetree/bindings/phy/berlin-sata-phy.txt	added	+34	−0	View file
Documentation/devicetree/bindings/phy/hix5hd2-phy.txt	added	+22	−0	View file
Documentation/devicetree/bindings/phy/phy-bindings.txt	modified	+4	−0	View file
Documentation/devicetree/bindings/phy/phy-miphy365x.txt	added	+76	−0	View file
Documentation/devicetree/bindings/phy/qcom-apq8064-sata-phy.txt	added	+24	−0	View file
Documentation/devicetree/bindings/phy/qcom-ipq806x-sata-phy.txt	added	+23	−0	View file
Documentation/devicetree/bindings/phy/samsung-phy.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/phy/ti-phy.txt	modified	+16	−7	View file
Documentation/devicetree/bindings/usb/ci-hdrc-imx.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt	modified	+8	−0	View file
Documentation/devicetree/bindings/usb/usb-xhci.txt	modified	+2	−1	View file
Documentation/phy.txt	modified	+6	−4	View file
Documentation/usb/hotplug.txt	modified	+4	−4	View file
Documentation/usb/power-management.txt	modified	+243	−2	View file
arch/arm/boot/dts/tegra114.dtsi	modified	+5	−0	View file
arch/arm/boot/dts/tegra124.dtsi	modified	+7	−0	View file
arch/arm/boot/dts/tegra20.dtsi	modified	+7	−0	View file
arch/arm/boot/dts/tegra30.dtsi	modified	+7	−0	View file
drivers/phy/Kconfig	modified	+53	−25	View file
drivers/phy/Makefile	modified	+5	−0	View file
drivers/phy/phy-bcm-kona-usb2.c	modified	+1	−1	View file
drivers/phy/phy-berlin-sata.c	added	+284	−0	View file
drivers/phy/phy-core.c	modified	+49	−7	View file
drivers/phy/phy-exynos-dp-video.c	modified	+3	−4	View file
drivers/phy/phy-exynos-mipi-video.c	modified	+3	−4	View file
drivers/phy/phy-exynos4x12-usb2.c	modified	+88	−37	View file
drivers/phy/phy-exynos5-usbdrd.c	modified	+5	−4	View file
drivers/phy/phy-exynos5250-sata.c	modified	+1	−1	View file
drivers/phy/phy-exynos5250-usb2.c	modified	+0	−2	View file
drivers/phy/phy-hix5hd2-sata.c	added	+192	−0	View file
drivers/phy/phy-miphy365x.c	added	+636	−0	View file
drivers/phy/phy-mvebu-sata.c	modified	+1	−1	View file
drivers/phy/phy-omap-control.c	modified	+51	−1	View file
drivers/phy/phy-omap-usb2.c	modified	+1	−1	View file
drivers/phy/phy-qcom-apq8064-sata.c	added	+289	−0	View file
drivers/phy/phy-qcom-ipq806x-sata.c	added	+211	−0	View file
drivers/phy/phy-samsung-usb2.c	modified	+8	−1	View file
drivers/phy/phy-samsung-usb2.h	modified	+4	−1	View file
drivers/phy/phy-sun4i-usb.c	modified	+3	−4	View file
drivers/phy/phy-ti-pipe3.c	modified	+85	−22	View file
drivers/phy/phy-twl4030-usb.c	modified	+1	−1	View file
drivers/phy/phy-xgene.c	modified	+1	−1	View file
drivers/usb/chipidea/ci_hdrc_imx.c	modified	+3	−0	View file
drivers/usb/chipidea/debug.c	modified	+2	−2	View file
drivers/usb/class/usbtmc.c	modified	+1	−1	View file
drivers/usb/core/config.c	modified	+11	−0	View file
drivers/usb/core/devio.c	modified	+1	−1	View file
drivers/usb/core/driver.c	modified	+4	−3	View file
drivers/usb/core/hcd-pci.c	modified	+2	−0	View file
drivers/usb/core/hcd.c	modified	+0	−4	View file
drivers/usb/core/hub.c	modified	+78	−16	View file
drivers/usb/core/hub.h	modified	+2	−0	View file
drivers/usb/core/port.c	modified	+12	−9	View file
drivers/usb/core/quirks.c	modified	+7	−0	View file
drivers/usb/core/urb.c	modified	+1	−0	View file
drivers/usb/core/usb.c	modified	+1	−0	View file
drivers/usb/dwc2/gadget.c	modified	+4	−8	View file
drivers/usb/dwc3/Kconfig	modified	+7	−0	View file
drivers/usb/dwc3/core.c	modified	+32	−19	View file
drivers/usb/dwc3/core.h	modified	+13	−0	View file
drivers/usb/dwc3/dwc3-omap.c	modified	+86	−86	View file
drivers/usb/dwc3/gadget.c	modified	+3	−4	View file
drivers/usb/dwc3/host.c	modified	+14	−0	View file
drivers/usb/gadget/Kconfig	modified	+2	−822	View file
drivers/usb/gadget/Makefile	modified	+4	−97	View file
drivers/usb/gadget/composite.c	modified	+1	−0	View file
drivers/usb/gadget/configfs.c	modified	+1	−3	View file
drivers/usb/gadget/function/Makefile	added	+34	−0	View file
drivers/usb/gadget/f_acm.c → drivers/usb/gadget/function/f_acm.c	renamed	+0	−0	View file
drivers/usb/gadget/f_ecm.c → drivers/usb/gadget/function/f_ecm.c	renamed	+0	−0	View file
drivers/usb/gadget/f_eem.c → drivers/usb/gadget/function/f_eem.c	renamed	+10	−12	View file
drivers/usb/gadget/f_fs.c → drivers/usb/gadget/function/f_fs.c	renamed	+339	−13	View file
drivers/usb/gadget/f_hid.c → drivers/usb/gadget/function/f_hid.c	renamed	+0	−0	View file
drivers/usb/gadget/f_loopback.c → drivers/usb/gadget/function/f_loopback.c	renamed	+0	−0	View file
drivers/usb/gadget/f_mass_storage.c → drivers/usb/gadget/function/f_mass_storage.c	renamed	+0	−0	View file
drivers/usb/gadget/f_mass_storage.h → drivers/usb/gadget/function/f_mass_storage.h	renamed	+0	−0	View file
drivers/usb/gadget/f_midi.c → drivers/usb/gadget/function/f_midi.c	renamed	+0	−0	View file
drivers/usb/gadget/f_ncm.c → drivers/usb/gadget/function/f_ncm.c	renamed	+332	−148	View file
drivers/usb/gadget/f_obex.c → drivers/usb/gadget/function/f_obex.c	renamed	+0	−0	View file
drivers/usb/gadget/f_phonet.c → drivers/usb/gadget/function/f_phonet.c	renamed	+0	−0	View file
drivers/usb/gadget/f_rndis.c → drivers/usb/gadget/function/f_rndis.c	renamed	+4	−0	View file
drivers/usb/gadget/f_serial.c → drivers/usb/gadget/function/f_serial.c	renamed	+0	−0	View file
drivers/usb/gadget/f_sourcesink.c → drivers/usb/gadget/function/f_sourcesink.c	renamed	+0	−0	View file
drivers/usb/gadget/f_subset.c → drivers/usb/gadget/function/f_subset.c	renamed	+0	−0	View file
drivers/usb/gadget/f_uac1.c → drivers/usb/gadget/function/f_uac1.c	renamed	+0	−0	View file
drivers/usb/gadget/f_uac2.c → drivers/usb/gadget/function/f_uac2.c	renamed	+22	−2	View file
drivers/usb/gadget/f_uvc.c → drivers/usb/gadget/function/f_uvc.c	renamed	+0	−0	View file
drivers/usb/gadget/f_uvc.h → drivers/usb/gadget/function/f_uvc.h	renamed	+0	−0	View file
drivers/usb/gadget/g_zero.h → drivers/usb/gadget/function/g_zero.h	renamed	+0	−0	View file
drivers/usb/gadget/ndis.h → drivers/usb/gadget/function/ndis.h	renamed	+0	−0	View file
drivers/usb/gadget/rndis.c → drivers/usb/gadget/function/rndis.c	renamed	+0	−0	View file
drivers/usb/gadget/rndis.h → drivers/usb/gadget/function/rndis.h	renamed	+0	−0	View file
drivers/usb/gadget/storage_common.c → drivers/usb/gadget/function/storage_common.c	renamed	+0	−0	View file
drivers/usb/gadget/storage_common.h → drivers/usb/gadget/function/storage_common.h	renamed	+0	−0	View file
drivers/usb/gadget/u_ecm.h → drivers/usb/gadget/function/u_ecm.h	renamed	+0	−0	View file
drivers/usb/gadget/u_eem.h → drivers/usb/gadget/function/u_eem.h	renamed	+0	−0	View file
drivers/usb/gadget/u_ether.c → drivers/usb/gadget/function/u_ether.c	renamed	+13	−6	View file
drivers/usb/gadget/u_ether.h → drivers/usb/gadget/function/u_ether.h	renamed	+2	−0	View file
drivers/usb/gadget/u_ether_configfs.h → drivers/usb/gadget/function/u_ether_configfs.h	renamed	+0	−0	View file
drivers/usb/gadget/u_fs.h → drivers/usb/gadget/function/u_fs.h	renamed	+7	−0	View file
drivers/usb/gadget/u_gether.h → drivers/usb/gadget/function/u_gether.h	renamed	+0	−0	View file
drivers/usb/gadget/u_ncm.h → drivers/usb/gadget/function/u_ncm.h	renamed	+0	−0	View file
drivers/usb/gadget/u_phonet.h → drivers/usb/gadget/function/u_phonet.h	renamed	+0	−0	View file
drivers/usb/gadget/u_rndis.h → drivers/usb/gadget/function/u_rndis.h	renamed	+0	−0	View file
drivers/usb/gadget/u_serial.c → drivers/usb/gadget/function/u_serial.c	renamed	+0	−0	View file
drivers/usb/gadget/u_serial.h → drivers/usb/gadget/function/u_serial.h	renamed	+0	−0	View file
drivers/usb/gadget/u_uac1.c → drivers/usb/gadget/function/u_uac1.c	renamed	+0	−0	View file
drivers/usb/gadget/u_uac1.h → drivers/usb/gadget/function/u_uac1.h	renamed	+0	−0	View file
drivers/usb/gadget/uvc.h → drivers/usb/gadget/function/uvc.h	renamed	+0	−0	View file
drivers/usb/gadget/uvc_queue.c → drivers/usb/gadget/function/uvc_queue.c	renamed	+0	−0	View file
drivers/usb/gadget/uvc_queue.h → drivers/usb/gadget/function/uvc_queue.h	renamed	+0	−0	View file
drivers/usb/gadget/uvc_v4l2.c → drivers/usb/gadget/function/uvc_v4l2.c	renamed	+0	−0	View file
drivers/usb/gadget/uvc_video.c → drivers/usb/gadget/function/uvc_video.c	renamed	+0	−0	View file
drivers/usb/gadget/legacy/Kconfig	added	+475	−0	View file
drivers/usb/gadget/legacy/Makefile	added	+44	−0	View file
drivers/usb/gadget/acm_ms.c → drivers/usb/gadget/legacy/acm_ms.c	renamed	+2	−12	View file
drivers/usb/gadget/audio.c → drivers/usb/gadget/legacy/audio.c	renamed	+1	−11	View file
drivers/usb/gadget/cdc2.c → drivers/usb/gadget/legacy/cdc2.c	renamed	+2	−12	View file
drivers/usb/gadget/dbgp.c → drivers/usb/gadget/legacy/dbgp.c	renamed	+0	−0	View file
drivers/usb/gadget/ether.c → drivers/usb/gadget/legacy/ether.c	renamed	+2	−12	View file
drivers/usb/gadget/g_ffs.c → drivers/usb/gadget/legacy/g_ffs.c	renamed	+1	−1	View file
drivers/usb/gadget/gmidi.c → drivers/usb/gadget/legacy/gmidi.c	renamed	+1	−12	View file
drivers/usb/gadget/hid.c → drivers/usb/gadget/legacy/hid.c	renamed	+0	−0	View file
drivers/usb/gadget/inode.c → drivers/usb/gadget/legacy/inode.c	renamed	+0	−0	View file
drivers/usb/gadget/mass_storage.c → drivers/usb/gadget/legacy/mass_storage.c	renamed	+0	−0	View file
drivers/usb/gadget/multi.c → drivers/usb/gadget/legacy/multi.c	renamed	+1	−12	View file
drivers/usb/gadget/ncm.c → drivers/usb/gadget/legacy/ncm.c	renamed	+2	−12	View file
drivers/usb/gadget/nokia.c → drivers/usb/gadget/legacy/nokia.c	renamed	+1	−11	View file
drivers/usb/gadget/printer.c → drivers/usb/gadget/legacy/printer.c	renamed	+0	−0	View file
drivers/usb/gadget/serial.c → drivers/usb/gadget/legacy/serial.c	renamed	+0	−0	View file
drivers/usb/gadget/tcm_usb_gadget.c → drivers/usb/gadget/legacy/tcm_usb_gadget.c	renamed	+0	−0	View file
drivers/usb/gadget/tcm_usb_gadget.h → drivers/usb/gadget/legacy/tcm_usb_gadget.h	renamed	+0	−0	View file
drivers/usb/gadget/webcam.c → drivers/usb/gadget/legacy/webcam.c	renamed	+1	−14	View file
drivers/usb/gadget/zero.c → drivers/usb/gadget/legacy/zero.c	renamed	+2	−12	View file
drivers/usb/gadget/net2280.c	deleted	+0	−2905	View before deletion
drivers/usb/gadget/u_os_desc.h	modified	+46	−13	View file
drivers/usb/gadget/udc/Kconfig	added	+385	−0	View file
drivers/usb/gadget/udc/Makefile	added	+31	−0	View file
drivers/usb/gadget/amd5536udc.c → drivers/usb/gadget/udc/amd5536udc.c	renamed	+0	−0	View file
drivers/usb/gadget/amd5536udc.h → drivers/usb/gadget/udc/amd5536udc.h	renamed	+0	−0	View file
drivers/usb/gadget/at91_udc.c → drivers/usb/gadget/udc/at91_udc.c	renamed	+0	−0	View file
drivers/usb/gadget/at91_udc.h → drivers/usb/gadget/udc/at91_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/atmel_usba_udc.c → drivers/usb/gadget/udc/atmel_usba_udc.c	renamed	+1	−1	View file
drivers/usb/gadget/atmel_usba_udc.h → drivers/usb/gadget/udc/atmel_usba_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/bcm63xx_udc.c → drivers/usb/gadget/udc/bcm63xx_udc.c	renamed	+0	−0	View file
drivers/usb/gadget/dummy_hcd.c → drivers/usb/gadget/udc/dummy_hcd.c	renamed	+0	−0	View file
drivers/usb/gadget/fotg210-udc.c → drivers/usb/gadget/udc/fotg210-udc.c	renamed	+0	−0	View file
drivers/usb/gadget/fotg210.h → drivers/usb/gadget/udc/fotg210.h	renamed	+0	−0	View file
drivers/usb/gadget/fsl_mxc_udc.c → drivers/usb/gadget/udc/fsl_mxc_udc.c	renamed	+2	−0	View file
drivers/usb/gadget/fsl_qe_udc.c → drivers/usb/gadget/udc/fsl_qe_udc.c	renamed	+7	−12	View file
drivers/usb/gadget/fsl_qe_udc.h → drivers/usb/gadget/udc/fsl_qe_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/fsl_udc_core.c → drivers/usb/gadget/udc/fsl_udc_core.c	renamed	+11	−8	View file
drivers/usb/gadget/fsl_usb2_udc.h → drivers/usb/gadget/udc/fsl_usb2_udc.h	renamed	+3	−0	View file
drivers/usb/gadget/fusb300_udc.c → drivers/usb/gadget/udc/fusb300_udc.c	renamed	+1	−3	View file
drivers/usb/gadget/fusb300_udc.h → drivers/usb/gadget/udc/fusb300_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/gadget_chips.h → drivers/usb/gadget/udc/gadget_chips.h	renamed	+0	−0	View file
drivers/usb/gadget/goku_udc.c → drivers/usb/gadget/udc/goku_udc.c	renamed	+0	−0	View file
drivers/usb/gadget/goku_udc.h → drivers/usb/gadget/udc/goku_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/gr_udc.c → drivers/usb/gadget/udc/gr_udc.c	renamed	+1	−1	View file
drivers/usb/gadget/gr_udc.h → drivers/usb/gadget/udc/gr_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/lpc32xx_udc.c → drivers/usb/gadget/udc/lpc32xx_udc.c	renamed	+3	−4	View file
drivers/usb/gadget/m66592-udc.c → drivers/usb/gadget/udc/m66592-udc.c	renamed	+1	−3	View file
drivers/usb/gadget/m66592-udc.h → drivers/usb/gadget/udc/m66592-udc.h	renamed	+0	−0	View file
drivers/usb/gadget/mv_u3d.h → drivers/usb/gadget/udc/mv_u3d.h	renamed	+0	−0	View file
drivers/usb/gadget/mv_u3d_core.c → drivers/usb/gadget/udc/mv_u3d_core.c	renamed	+0	−0	View file
drivers/usb/gadget/mv_udc.h → drivers/usb/gadget/udc/mv_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/mv_udc_core.c → drivers/usb/gadget/udc/mv_udc_core.c	renamed	+2	−2	View file
drivers/usb/gadget/net2272.c → drivers/usb/gadget/udc/net2272.c	renamed	+1	−1	View file
drivers/usb/gadget/net2272.h → drivers/usb/gadget/udc/net2272.h	renamed	+0	−0	View file
drivers/usb/gadget/udc/net2280.c	added	+3827	−0	View file
drivers/usb/gadget/net2280.h → drivers/usb/gadget/udc/net2280.h	renamed	+190	−95	View file
drivers/usb/gadget/omap_udc.c → drivers/usb/gadget/udc/omap_udc.c	renamed	+1	−4	View file
drivers/usb/gadget/omap_udc.h → drivers/usb/gadget/udc/omap_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/pch_udc.c → drivers/usb/gadget/udc/pch_udc.c	renamed	+0	−0	View file
drivers/usb/gadget/pxa25x_udc.c → drivers/usb/gadget/udc/pxa25x_udc.c	renamed	+23	−52	View file
drivers/usb/gadget/pxa25x_udc.h → drivers/usb/gadget/udc/pxa25x_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/pxa27x_udc.c → drivers/usb/gadget/udc/pxa27x_udc.c	renamed	+6	−0	View file
drivers/usb/gadget/pxa27x_udc.h → drivers/usb/gadget/udc/pxa27x_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/r8a66597-udc.c → drivers/usb/gadget/udc/r8a66597-udc.c	renamed	+28	−64	View file
drivers/usb/gadget/r8a66597-udc.h → drivers/usb/gadget/udc/r8a66597-udc.h	renamed	+0	−0	View file
drivers/usb/gadget/s3c-hsudc.c → drivers/usb/gadget/udc/s3c-hsudc.c	renamed	+0	−0	View file
drivers/usb/gadget/s3c2410_udc.c → drivers/usb/gadget/udc/s3c2410_udc.c	renamed	+4	−4	View file
drivers/usb/gadget/s3c2410_udc.h → drivers/usb/gadget/udc/s3c2410_udc.h	renamed	+0	−0	View file
drivers/usb/gadget/udc-core.c → drivers/usb/gadget/udc/udc-core.c	renamed	+0	−0	View file
drivers/usb/host/Kconfig	modified	+8	−0	View file
drivers/usb/host/Makefile	modified	+3	−0	View file
drivers/usb/host/ehci-exynos.c	modified	+1	−1	View file
drivers/usb/host/ehci-mem.c	modified	+1	−1	View file
drivers/usb/host/ehci-msm.c	modified	+1	−1	View file
drivers/usb/host/ehci-pci.c	modified	+25	−0	View file
drivers/usb/host/ehci-spear.c	modified	+1	−1	View file
drivers/usb/host/ehci-tegra.c	modified	+62	−5	View file
drivers/usb/host/fhci-dbg.c	modified	+2	−6	View file
drivers/usb/host/fotg210-hcd.c	modified	+9	−39	View file
drivers/usb/host/max3421-hcd.c	modified	+22	−26	View file
drivers/usb/host/ohci-dbg.c	modified	+5	−4	View file
drivers/usb/host/ohci-exynos.c	modified	+1	−1	View file
drivers/usb/host/ohci-hcd.c	modified	+211	−170	View file
drivers/usb/host/ohci-hub.c	modified	+7	−4	View file
drivers/usb/host/ohci-mem.c	modified	+1	−0	View file
drivers/usb/host/ohci-q.c	modified	+163	−99	View file
drivers/usb/host/ohci-spear.c	modified	+1	−1	View file
drivers/usb/host/ohci.h	modified	+17	−6	View file
drivers/usb/host/oxu210hp-hcd.c	modified	+9	−39	View file
drivers/usb/host/uhci-grlib.c	modified	+9	−22	View file
drivers/usb/host/uhci-hcd.c	modified	+1	−1	View file
drivers/usb/host/uhci-platform.c	modified	+5	−17	View file
drivers/usb/host/xhci-pci.c	modified	+5	−3	View file
drivers/usb/host/xhci-plat.c	modified	+32	−20	View file
drivers/usb/host/xhci-rcar.c	added	+148	−0	View file
drivers/usb/host/xhci-rcar.h	added	+27	−0	View file
drivers/usb/host/xhci-ring.c	modified	+4	−0	View file
drivers/usb/host/xhci.c	modified	+90	−70	View file
drivers/usb/host/xhci.h	modified	+2	−0	View file
drivers/usb/misc/Kconfig	modified	+7	−0	View file
drivers/usb/misc/Makefile	modified	+1	−0	View file
drivers/usb/misc/lvstest.c	added	+460	−0	View file
drivers/usb/misc/usb3503.c	modified	+34	−3	View file
drivers/usb/musb/blackfin.c	modified	+8	−12	View file
drivers/usb/musb/davinci.c	modified	+6	−14	View file
drivers/usb/musb/jz4740.c	modified	+3	−0	View file
drivers/usb/musb/musb_core.c	modified	+21	−20	View file
drivers/usb/musb/musb_core.h	modified	+7	−5	View file
drivers/usb/musb/musb_cppi41.c	modified	+13	−57	View file
drivers/usb/musb/musb_dma.h	modified	+1	−0	View file
drivers/usb/musb/musb_dsps.c	modified	+97	−7	View file
drivers/usb/musb/musb_host.c	modified	+10	−9	View file
drivers/usb/musb/musb_regs.h	modified	+7	−0	View file
drivers/usb/musb/tusb6010.c	modified	+5	−11	View file
drivers/usb/musb/ux500.c	modified	+10	−18	View file
drivers/usb/phy/phy-am335x.c	modified	+3	−9	View file
drivers/usb/phy/phy-gpio-vbus-usb.c	modified	+13	−32	View file
drivers/usb/phy/phy-msm-usb.c	modified	+6	−6	View file
drivers/usb/phy/phy-tegra-usb.c	modified	+4	−7	View file
drivers/usb/renesas_usbhs/Makefile	modified	+1	−1	View file
drivers/usb/renesas_usbhs/common.c	modified	+61	−5	View file
drivers/usb/renesas_usbhs/common.h	modified	+2	−0	View file
drivers/usb/renesas_usbhs/mod_gadget.c	modified	+2	−0	View file
drivers/usb/renesas_usbhs/pipe.c	modified	+11	−0	View file
drivers/usb/renesas_usbhs/pipe.h	modified	+1	−0	View file
drivers/usb/renesas_usbhs/rcar2.c	added	+77	−0	View file
drivers/usb/renesas_usbhs/rcar2.h	added	+4	−0	View file
drivers/usb/serial/cp210x.c	modified	+0	−3	View file
drivers/usb/serial/ftdi_sio.c	modified	+25	−59	View file
drivers/usb/serial/ftdi_sio_ids.h	modified	+8	−5	View file
drivers/usb/serial/kl5kusb105.c	modified	+0	−30	View file
drivers/usb/serial/mos7840.c	modified	+1	−4	View file
drivers/usb/storage/uas-detect.h	modified	+19	−21	View file
drivers/usb/storage/uas.c	modified	+1	−1	View file
drivers/uwb/whci.c	modified	+1	−1	View file
include/dt-bindings/phy/phy-miphy365x.h	added	+14	−0	View file
include/linux/phy/omap_control_phy.h	modified	+10	−0	View file
include/linux/phy/phy.h	modified	+12	−5	View file
include/linux/usb/composite.h	modified	+15	−0	View file
include/linux/usb/quirks.h	modified	+11	−0	View file
include/linux/usb/renesas_usbhs.h	modified	+6	−0	View file
include/linux/usb/usb338x.h	added	+199	−0	View file
include/linux/usb/xhci_pdriver.h	added	+27	−0	View file
include/uapi/linux/usb/functionfs.h	modified	+80	−2	View file
tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c	modified	+35	−4	View file
tools/usb/ffs-aio-example/multibuff/host_app/test.c	modified	+27	−0	View file
tools/usb/ffs-aio-example/simple/device_app/aio_simple.c	modified	+35	−4	View file
tools/usb/ffs-aio-example/simple/host_app/test.c	modified	+27	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/stable/sysfs-bus-usb

View file

diff --git a/Documentation/ABI/stable/sysfs-bus-usb b/Documentation/ABI/stable/sysfs-bus-usb
index a6b6857..e2bc700 100644
--- a/Documentation/ABI/stable/sysfs-bus-usb
+++ b/Documentation/ABI/stable/sysfs-bus-usb
@@ -3,13 +3,13 @@ Date:		May 2007
 KernelVersion:	2.6.23
 Contact:	Alan Stern <[email protected]>
 Description:
-		If CONFIG_USB_PERSIST is set, then each USB device directory
-		will contain a file named power/persist.  The file holds a
-		boolean value (0 or 1) indicating whether or not the
-		"USB-Persist" facility is enabled for the device.  Since the
-		facility is inherently dangerous, it is disabled by default
-		for all devices except hubs.  For more information, see
-		Documentation/usb/persist.txt.
+		USB device directories can contain a file named power/persist.
+		The file holds a boolean value (0 or 1) indicating whether or
+		not the "USB-Persist" facility is enabled for the device.  For
+		hubs this facility is always enabled and their device
+		directories will not contain this file.
+
+		For more information, see Documentation/usb/persist.txt.
 
 What:		/sys/bus/usb/devices/.../power/autosuspend
 Date:		March 2007

Documentation/ABI/testing/sysfs-bus-usb-lvstest

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-usb-lvstest b/Documentation/ABI/testing/sysfs-bus-usb-lvstest
new file mode 100644
index 0000000..aae68fc
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-usb-lvstest
@@ -0,0 +1,47 @@
+Link Layer Validation Device is a standard device for testing of Super
+Speed Link Layer tests. These nodes are available in sysfs only when lvs
+driver is bound with root hub device.
+
+What:		/sys/bus/usb/devices/.../get_dev_desc
+Date:		March 2014
+Contact:	Pratyush Anand <[email protected]>
+Description:
+		Write to this node to issue "Get Device Descriptor"
+		for Link Layer Validation device. It is needed for TD.7.06.
+
+What:		/sys/bus/usb/devices/.../u1_timeout
+Date:		March 2014
+Contact:	Pratyush Anand <[email protected]>
+Description:
+		Set "U1 timeout" for the downstream port where Link Layer
+		Validation device is connected. Timeout value must be between 0
+		and 127. It is needed for TD.7.18, TD.7.19, TD.7.20 and TD.7.21.
+
+What:		/sys/bus/usb/devices/.../u2_timeout
+Date:		March 2014
+Contact:	Pratyush Anand <[email protected]>
+Description:
+		Set "U2 timeout" for the downstream port where Link Layer
+		Validation device is connected. Timeout value must be between 0
+		and 127. It is needed for TD.7.18, TD.7.19, TD.7.20 and TD.7.21.
+
+What:		/sys/bus/usb/devices/.../hot_reset
+Date:		March 2014
+Contact:	Pratyush Anand <[email protected]>
+Description:
+		Write to this node to issue "Reset" for Link Layer Validation
+		device. It is needed for TD.7.29, TD.7.31, TD.7.34 and TD.7.35.
+
+What:		/sys/bus/usb/devices/.../u3_entry
+Date:		March 2014
+Contact:	Pratyush Anand <[email protected]>
+Description:
+		Write to this node to issue "U3 entry" for Link Layer
+		Validation device. It is needed for TD.7.35 and TD.7.36.
+
+What:		/sys/bus/usb/devices/.../u3_exit
+Date:		March 2014
+Contact:	Pratyush Anand <[email protected]>
+Description:
+		Write to this node to issue "U3 exit" for Link Layer
+		Validation device. It is needed for TD.7.36.

Documentation/DocBook/gadget.tmpl

View file

diff --git a/Documentation/DocBook/gadget.tmpl b/Documentation/DocBook/gadget.tmpl
index 2c425d7..6416292 100644
--- a/Documentation/DocBook/gadget.tmpl
+++ b/Documentation/DocBook/gadget.tmpl
@@ -556,11 +556,11 @@ been converted to this framework.
 Near-term plans include converting all of them, except for "gadgetfs".
 </para>
 
-!Edrivers/usb/gadget/f_acm.c
-!Edrivers/usb/gadget/f_ecm.c
-!Edrivers/usb/gadget/f_subset.c
-!Edrivers/usb/gadget/f_obex.c
-!Edrivers/usb/gadget/f_serial.c
+!Edrivers/usb/gadget/function/f_acm.c
+!Edrivers/usb/gadget/function/f_ecm.c
+!Edrivers/usb/gadget/function/f_subset.c
+!Edrivers/usb/gadget/function/f_obex.c
+!Edrivers/usb/gadget/function/f_serial.c
 
 </sect1>
 

Documentation/devicetree/bindings/phy/berlin-sata-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/berlin-sata-phy.txt b/Documentation/devicetree/bindings/phy/berlin-sata-phy.txt
new file mode 100644
index 0000000..88f8c23
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/berlin-sata-phy.txt
@@ -0,0 +1,34 @@
+Berlin SATA PHY
+---------------
+
+Required properties:
+- compatible: should be "marvell,berlin2q-sata-phy"
+- address-cells: should be 1
+- size-cells: should be 0
+- phy-cells: from the generic PHY bindings, must be 1
+- reg: address and length of the register
+- clocks: reference to the clock entry
+
+Sub-nodes:
+Each PHY should be represented as a sub-node.
+
+Sub-nodes required properties:
+- reg: the PHY number
+
+Example:
+	sata_phy: phy@f7e900a0 {
+		compatible = "marvell,berlin2q-sata-phy";
+		reg = <0xf7e900a0 0x200>;
+		clocks = <&chip CLKID_SATA>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		#phy-cells = <1>;
+
+		sata-phy@0 {
+			reg = <0>;
+		};
+
+		sata-phy@1 {
+			reg = <1>;
+		};
+	};

Documentation/devicetree/bindings/phy/hix5hd2-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/hix5hd2-phy.txt b/Documentation/devicetree/bindings/phy/hix5hd2-phy.txt
new file mode 100644
index 0000000..296168b
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/hix5hd2-phy.txt
@@ -0,0 +1,22 @@
+Hisilicon hix5hd2 SATA PHY
+-----------------------
+
+Required properties:
+- compatible: should be "hisilicon,hix5hd2-sata-phy"
+- reg: offset and length of the PHY registers
+- #phy-cells: must be 0
+Refer to phy/phy-bindings.txt for the generic PHY binding properties
+
+Optional Properties:
+- hisilicon,peripheral-syscon: phandle of syscon used to control peripheral.
+- hisilicon,power-reg: offset and bit number within peripheral-syscon,
+	register of controlling sata power supply.
+
+Example:
+	sata_phy: phy@f9900000 {
+		compatible = "hisilicon,hix5hd2-sata-phy";
+		reg = <0xf9900000 0x10000>;
+		#phy-cells = <0>;
+		hisilicon,peripheral-syscon = <&peripheral_ctrl>;
+		hisilicon,power-reg = <0x8 10>;
+	};

Documentation/devicetree/bindings/phy/phy-bindings.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/phy-bindings.txt b/Documentation/devicetree/bindings/phy/phy-bindings.txt
index 8ae844f..2aa1840 100644
--- a/Documentation/devicetree/bindings/phy/phy-bindings.txt
+++ b/Documentation/devicetree/bindings/phy/phy-bindings.txt
@@ -10,6 +10,10 @@ Required Properties:
 		provider can use the values in cells to find the appropriate
 		PHY.
 
+Optional Properties:
+phy-supply:	Phandle to a regulator that provides power to the PHY. This
+		regulator will be managed during the PHY power on/off sequence.
+
 For example:
 
 phys: phy {

Documentation/devicetree/bindings/phy/phy-miphy365x.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
new file mode 100644
index 0000000..42c8808
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
@@ -0,0 +1,76 @@
+STMicroelectronics STi MIPHY365x PHY binding
+============================================
+
+This binding describes a miphy device that is used to control PHY hardware
+for SATA and PCIe.
+
+Required properties (controller (parent) node):
+- compatible    : Should be "st,miphy365x-phy"
+- st,syscfg     : Should be a phandle of the system configuration register group
+		  which contain the SATA, PCIe mode setting bits
+
+Required nodes	:  A sub-node is required for each channel the controller
+		   provides. Address range information including the usual
+		   'reg' and 'reg-names' properties are used inside these
+		   nodes to describe the controller's topology. These nodes
+		   are translated by the driver's .xlate() function.
+
+Required properties (port (child) node):
+- #phy-cells 	: Should be 1 (See second example)
+		  Cell after port phandle is device type from:
+			- MIPHY_TYPE_SATA
+			- MIPHY_TYPE_PCI
+- reg        	: Address and length of register sets for each device in
+		  "reg-names"
+- reg-names     : The names of the register addresses corresponding to the
+		  registers filled in "reg":
+			- sata:   For SATA devices
+			- pcie:   For PCIe devices
+			- syscfg: To specify the syscfg based config register
+
+Optional properties (port (child) node):
+- st,sata-gen	     :	Generation of locally attached SATA IP. Expected values
+			are {1,2,3). If not supplied generation 1 hardware will
+			be expected
+- st,pcie-tx-pol-inv :	Bool property to invert the polarity PCIe Tx (Txn/Txp)
+- st,sata-tx-pol-inv :	Bool property to invert the polarity SATA Tx (Txn/Txp)
+
+Example:
+
+	miphy365x_phy: miphy365x@fe382000 {
+		compatible      = "st,miphy365x-phy";
+		st,syscfg  	= <&syscfg_rear>;
+		#address-cells	= <1>;
+		#size-cells	= <1>;
+		ranges;
+
+		phy_port0: port@fe382000 {
+			reg = <0xfe382000 0x100>, <0xfe394000 0x100>, <0x824 0x4>;
+			reg-names = "sata", "pcie", "syscfg";
+			#phy-cells = <1>;
+			st,sata-gen = <3>;
+		};
+
+		phy_port1: port@fe38a000 {
+			reg = <0xfe38a000 0x100>, <0xfe804000 0x100>, <0x828 0x4>;;
+			reg-names = "sata", "pcie", "syscfg";
+			#phy-cells = <1>;
+			st,pcie-tx-pol-inv;
+		};
+	};
+
+Specifying phy control of devices
+=================================
+
+Device nodes should specify the configuration required in their "phys"
+property, containing a phandle to the phy port node and a device type.
+
+Example:
+
+#include <dt-bindings/phy/phy-miphy365x.h>
+
+	sata0: sata@fe380000 {
+		...
+		phys	  = <&phy_port0 MIPHY_TYPE_SATA>;
+		...
+	};

Documentation/devicetree/bindings/phy/qcom-apq8064-sata-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/qcom-apq8064-sata-phy.txt b/Documentation/devicetree/bindings/phy/qcom-apq8064-sata-phy.txt
new file mode 100644
index 0000000..952f6c9
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/qcom-apq8064-sata-phy.txt
@@ -0,0 +1,24 @@
+Qualcomm APQ8064 SATA PHY Controller
+------------------------------------
+
+SATA PHY nodes are defined to describe on-chip SATA Physical layer controllers.
+Each SATA PHY controller should have its own node.
+
+Required properties:
+- compatible: compatible list, contains "qcom,apq8064-sata-phy".
+- reg: offset and length of the SATA PHY register set;
+- #phy-cells: must be zero
+- clocks: a list of phandles and clock-specifier pairs, one for each entry in
+  clock-names.
+- clock-names: must be "cfg" for phy config clock.
+
+Example:
+	sata_phy: sata-phy@1b400000 {
+		compatible = "qcom,apq8064-sata-phy";
+		reg = <0x1b400000 0x200>;
+
+		clocks = <&gcc SATA_PHY_CFG_CLK>;
+		clock-names = "cfg";
+
+		#phy-cells = <0>;
+	};

Documentation/devicetree/bindings/phy/qcom-ipq806x-sata-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/qcom-ipq806x-sata-phy.txt b/Documentation/devicetree/bindings/phy/qcom-ipq806x-sata-phy.txt
new file mode 100644
index 0000000..76bfbd0
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/qcom-ipq806x-sata-phy.txt
@@ -0,0 +1,23 @@
+Qualcomm IPQ806x SATA PHY Controller
+------------------------------------
+
+SATA PHY nodes are defined to describe on-chip SATA Physical layer controllers.
+Each SATA PHY controller should have its own node.
+
+Required properties:
+- compatible: compatible list, contains "qcom,ipq806x-sata-phy"
+- reg: offset and length of the SATA PHY register set;
+- #phy-cells: must be zero
+- clocks: must be exactly one entry
+- clock-names: must be "cfg"
+
+Example:
+	sata_phy: sata-phy@1b400000 {
+		compatible = "qcom,ipq806x-sata-phy";
+		reg = <0x1b400000 0x200>;
+
+		clocks = <&gcc SATA_PHY_CFG_CLK>;
+		clock-names = "cfg";
+
+		#phy-cells = <0>;
+	};

Documentation/devicetree/bindings/phy/samsung-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt
index 2049261..6099a5c 100644
--- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
+++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
@@ -26,6 +26,7 @@ Samsung S5P/EXYNOS SoC series USB PHY
 
 Required properties:
 - compatible : should be one of the listed compatibles:
+	- "samsung,exynos3250-usb2-phy"
 	- "samsung,exynos4210-usb2-phy"
 	- "samsung,exynos4x12-usb2-phy"
 	- "samsung,exynos5250-usb2-phy"
@@ -46,6 +47,7 @@ and Exynos 4212) it is as follows:
   1 - USB host ("host"),
   2 - HSIC0 ("hsic0"),
   3 - HSIC1 ("hsic1"),
+Exynos3250 has only USB device phy available as phy 0.
 
 Exynos 4210 and Exynos 4212 use mode switching and require that mode switch
 register is supplied.

Documentation/devicetree/bindings/phy/ti-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt
index 9ce458f..305e3df 100644
--- a/Documentation/devicetree/bindings/phy/ti-phy.txt
+++ b/Documentation/devicetree/bindings/phy/ti-phy.txt
@@ -9,15 +9,17 @@ Required properties:
                         e.g. USB2_PHY on OMAP5.
  "ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control
                         e.g. USB3 PHY and SATA PHY on OMAP5.
+ "ti,control-phy-pcie" - for pcie to support external clock for pcie and to
+			set PCS delay value.
+			e.g. PCIE PHY in DRA7x
  "ti,control-phy-usb2-dra7" - if it has power down register like USB2 PHY on
                         DRA7 platform.
  "ti,control-phy-usb2-am437" - if it has power down register like USB2 PHY on
                         AM437 platform.
- - reg : Address and length of the register set for the device. It contains
-   the address of "otghs_control" for control-phy-otghs or "power" register
-   for other types.
- - reg-names: should be "otghs_control" control-phy-otghs and "power" for
-   other types.
+ - reg : register ranges as listed in the reg-names property
+ - reg-names: "otghs_control" for control-phy-otghs
+	      "power", "pcie_pcs" and "control_sma" for control-phy-pcie
+	      "power" for all other types
 
 omap_control_usb: omap-control-usb@4a002300 {
         compatible = "ti,control-phy-otghs";
@@ -56,8 +58,8 @@ usb2phy@4a0ad080 {
 TI PIPE3 PHY
 
 Required properties:
- - compatible: Should be "ti,phy-usb3" or "ti,phy-pipe3-sata".
-   "ti,omap-usb3" is deprecated.
+ - compatible: Should be "ti,phy-usb3", "ti,phy-pipe3-sata" or
+   "ti,phy-pipe3-pcie. "ti,omap-usb3" is deprecated.
  - reg : Address and length of the register set for the device.
  - reg-names: The names of the register addresses corresponding to the registers
    filled in "reg".
@@ -69,10 +71,17 @@ Required properties:
    * "wkupclk" - wakeup clock.
    * "sysclk" - system clock.
    * "refclk" - reference clock.
+   * "dpll_ref" - external dpll ref clk
+   * "dpll_ref_m2" - external dpll ref clk
+   * "phy-div" - divider for apll
+   * "div-clk" - apll clock
 
 Optional properties:
  - ctrl-module : phandle of the control module used by PHY driver to power on
    the PHY.
+ - id: If there are multiple instance of the same type, in order to
+   differentiate between each instance "id" can be used (e.g., multi-lane PCIe
+   PHY). If "id" is not provided, it is set to default value of '1'.
 
 This is usually a subnode of ocp2scp to which it is connected.
 

Documentation/devicetree/bindings/usb/ci-hdrc-imx.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-imx.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-imx.txt
index a6a32cb..1bae71e 100644
--- a/Documentation/devicetree/bindings/usb/ci-hdrc-imx.txt
+++ b/Documentation/devicetree/bindings/usb/ci-hdrc-imx.txt
@@ -4,6 +4,7 @@ Required properties:
 - compatible: Should be "fsl,imx27-usb"
 - reg: Should contain registers location and length
 - interrupts: Should contain controller interrupt
+- fsl,usbphy: phandle of usb phy that connects to the port
 
 Recommended properies:
 - phy_type: the type of the phy connected to the core. Should be one
@@ -12,7 +13,6 @@ Recommended properies:
 - dr_mode: One of "host", "peripheral" or "otg". Defaults to "otg"
 
 Optional properties:
-- fsl,usbphy: phandler of usb phy that connects to the only one port
 - fsl,usbmisc: phandler of non-core register device, with one argument
   that indicate usb controller index
 - vbus-supply: regulator for vbus

Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
index ba797d3..c9205fb 100644
--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
@@ -20,6 +20,12 @@ Required properties :
      Present if phy_type == utmi.
    - ulpi-link: The clock Tegra provides to the ULPI PHY (cdev2).
      Present if phy_type == ulpi, and ULPI link mode is in use.
+ - resets : Must contain an entry for each entry in reset-names.
+   See ../reset/reset.txt for details.
+ - reset-names : Must include the following entries:
+   - usb: The PHY's own reset signal.
+   - utmi-pads: The reset of the PHY containing the chip-wide UTMI pad control
+     registers. Required even if phy_type == ulpi.
 
 Required properties for phy_type == ulpi:
   - nvidia,phy-reset-gpio : The GPIO used to reset the PHY.
@@ -56,6 +62,8 @@ Optional properties:
       host means this is a host controller
       peripheral means it is device controller
       otg means it can operate as either ("on the go")
+  - nvidia,has-utmi-pad-registers : boolean indicates whether this controller
+    contains the UTMI pad control registers common to all USB controllers.
 
 VBUS control (required for dr_mode == otg, optional for dr_mode == host):
   - vbus-supply: regulator for VBUS

Documentation/devicetree/bindings/usb/usb-xhci.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index 5a79377..86f67f0 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -9,8 +9,9 @@ Required properties:
     register set for the device.
   - interrupts: one XHCI interrupt should be described here.
 
-Optional property:
+Optional properties:
   - clocks: reference to a clock
+  - usb3-lpm-capable: determines if platform is USB3 LPM capable
 
 Example:
 	usb@f0931000 {

Documentation/phy.txt

View file

diff --git a/Documentation/phy.txt b/Documentation/phy.txt
index ebff6ee..c6594af 100644
--- a/Documentation/phy.txt
+++ b/Documentation/phy.txt
@@ -53,10 +53,12 @@ unregister the PHY.
 The PHY driver should create the PHY in order for other peripheral controllers
 to make use of it. The PHY framework provides 2 APIs to create the PHY.
 
-struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
-        struct phy_init_data *init_data);
-struct phy *devm_phy_create(struct device *dev, const struct phy_ops *ops,
-	struct phy_init_data *init_data);
+struct phy *phy_create(struct device *dev, struct device_node *node,
+		       const struct phy_ops *ops,
+		       struct phy_init_data *init_data);
+struct phy *devm_phy_create(struct device *dev, struct device_node *node,
+			    const struct phy_ops *ops,
+			    struct phy_init_data *init_data);
 
 The PHY drivers can use one of the above 2 APIs to create the PHY by passing
 the device pointer, phy ops and init_data.

Documentation/usb/hotplug.txt

View file

diff --git a/Documentation/usb/hotplug.txt b/Documentation/usb/hotplug.txt
index 6424b13..a80b0e9 100644
--- a/Documentation/usb/hotplug.txt
+++ b/Documentation/usb/hotplug.txt
@@ -105,13 +105,13 @@ macros such as these, and use driver_info to store more information.
 A short example, for a driver that supports several specific USB devices
 and their quirks, might have a MODULE_DEVICE_TABLE like this:
 
-    static const struct usb_device_id mydriver_id_table = {
+    static const struct usb_device_id mydriver_id_table[] = {
 	{ USB_DEVICE (0x9999, 0xaaaa), driver_info: QUIRK_X },
 	{ USB_DEVICE (0xbbbb, 0x8888), driver_info: QUIRK_Y|QUIRK_Z },
 	...
 	{ } /* end with an all-zeroes entry */
-    }
-    MODULE_DEVICE_TABLE (usb, mydriver_id_table);
+    };
+    MODULE_DEVICE_TABLE(usb, mydriver_id_table);
 
 Most USB device drivers should pass these tables to the USB subsystem as
 well as to the module management subsystem.  Not all, though: some driver
@@ -134,7 +134,7 @@ something like this:
 	if exposing any operations through usbdevfs:
 	    .ioctl		= my_ioctl,
 	*/
-    }
+    };
 
 When the USB subsystem knows about a driver's device ID table, it's used when
 choosing drivers to probe().  The thread doing new device processing checks

Documentation/usb/power-management.txt

View file

diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt
index 1392b61..7b90fe0 100644
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
@@ -2,8 +2,27 @@
 
 		 Alan Stern <[email protected]>
 
-			    October 28, 2010
-
+		       Last-updated: February 2014
+
+
+	Contents:
+	---------
+	* What is Power Management?
+	* What is Remote Wakeup?
+	* When is a USB device idle?
+	* Forms of dynamic PM
+	* The user interface for dynamic PM
+	* Changing the default idle-delay time
+	* Warnings
+	* The driver interface for Power Management
+	* The driver interface for autosuspend and autoresume
+	* Other parts of the driver interface
+	* Mutual exclusion
+	* Interaction between dynamic PM and system PM
+	* xHCI hardware link PM
+	* USB Port Power Control
+	* User Interface for Port Power Control
+	* Suggested Userspace Port Power Policy
 
 
 	What is Power Management?
@@ -516,3 +535,225 @@ relevant attribute files is usb2_hardware_lpm.
 		driver will enable hardware LPM	for the device. You
 		can write y/Y/1 or n/N/0 to the file to	enable/disable
 		USB2 hardware LPM manually. This is for	test purpose mainly.
+
+
+	USB Port Power Control
+	----------------------
+
+In addition to suspending endpoint devices and enabling hardware
+controlled link power management, the USB subsystem also has the
+capability to disable power to ports under some conditions.  Power is
+controlled through Set/ClearPortFeature(PORT_POWER) requests to a hub.
+In the case of a root or platform-internal hub the host controller
+driver translates PORT_POWER requests into platform firmware (ACPI)
+method calls to set the port power state. For more background see the
+Linux Plumbers Conference 2012 slides [1] and video [2]:
+
+Upon receiving a ClearPortFeature(PORT_POWER) request a USB port is
+logically off, and may trigger the actual loss of VBUS to the port [3].
+VBUS may be maintained in the case where a hub gangs multiple ports into
+a shared power well causing power to remain until all ports in the gang
+are turned off.  VBUS may also be maintained by hub ports configured for
+a charging application.  In any event a logically off port will lose
+connection with its device, not respond to hotplug events, and not
+respond to remote wakeup events*.
+
+WARNING: turning off a port may result in the inability to hot add a device.
+Please see "User Interface for Port Power Control" for details.
+
+As far as the effect on the device itself it is similar to what a device
+goes through during system suspend, i.e. the power session is lost.  Any
+USB device or driver that misbehaves with system suspend will be
+similarly affected by a port power cycle event.  For this reason the
+implementation shares the same device recovery path (and honors the same
+quirks) as the system resume path for the hub.
+
+[1]: http://dl.dropbox.com/u/96820575/sarah-sharp-lpt-port-power-off2-mini.pdf
+[2]: http://linuxplumbers.ubicast.tv/videos/usb-port-power-off-kerneluserspace-api/
+[3]: USB 3.1 Section 10.12
+* wakeup note: if a device is configured to send wakeup events the port
+  power control implementation will block poweroff attempts on that
+  port.
+
+
+	User Interface for Port Power Control
+	-------------------------------------
+
+The port power control mechanism uses the PM runtime system.  Poweroff is
+requested by clearing the power/pm_qos_no_power_off flag of the port device
+(defaults to 1).  If the port is disconnected it will immediately receive a
+ClearPortFeature(PORT_POWER) request.  Otherwise, it will honor the pm runtime
+rules and require the attached child device and all descendants to be suspended.
+This mechanism is dependent on the hub advertising port power switching in its
+hub descriptor (wHubCharacteristics logical power switching mode field).