| Message ID | 20140521222831.GD16911@saruman.home |
|---|---|
| State | New |
| Headers | show |
On Wed, May 21, 2014 at 05:28:31PM -0500, Felipe Balbi wrote: > Hi Greg, > > Here's my big dump for v3.16 merge window. Even though we have a lot of > patches, most of them are just doing cleanups and small bug fixes. > > Consider merging it to your usb-next branch. There will be a conflict > with drivers/usb/phy/phy-mv-u3d.c (deleted in your tree, modified on > mine). I'll let you decide what you really want to do, but I don't think > that driver should be deleted, even commented on original thread. I like the driver removed, if no one can use it or build it, no need to keep it around. Now merged and pushed out, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Greg, Here's my big dump for v3.16 merge window. Even though we have a lot of patches, most of them are just doing cleanups and small bug fixes. Consider merging it to your usb-next branch. There will be a conflict with drivers/usb/phy/phy-mv-u3d.c (deleted in your tree, modified on mine). I'll let you decide what you really want to do, but I don't think that driver should be deleted, even commented on original thread. cheers The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5: Linux 3.15-rc1 (2014-04-13 14:18:35 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-for-v3.16 for you to fetch changes up to 7751b6fb05869bcb318e74420148c06577adf894: usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call. (2014-05-16 12:16:31 -0500) ---------------------------------------------------------------- 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> ---------------------------------------------------------------- Alexandre Belloni (1): usb: gadget: atmel_usba: always test udc->driver Alexey Khoroshilov (1): usb: gadget: gr_udc: unconditionally use GFP_ATOMIC in gr_queue_ext() Andreas Larsson (7): usb: gadget: gr_udc: improve platform_device variable name usb: gadget: gr_udc: Expand devicetree documentation usb: gadget: gr_udc: Use platform_get_irq instead of irq_of_parse_and_map usb: gadget: gr_udc: Use of_property_read_u32_index to access arrays usb: gadget: gr_udc: Add ep.maxpacket_limit to debugfs information usb: gadget: gr_udc: Return error code when trying to set ep.maxpacket > ep.maxpacket_limit usb: gadget: gr_udc: Use GFP_ATOMIC when allocating under held spinlock Andrzej Pietrasiewicz (9): usb: gadget: FunctionFS: share VLA macros with all usb gadget files usb: gadget: OS String support usb: gadget: OS Feature Descriptors support usb: gadget: f_rndis: OS descriptors support usb: gadget: configfs: OS String support usb: gadget: configfs: OS Extended Compatibility descriptors support usb: gadget: f_rndis: OS Descriptors configfs support usb: gadget: configfs: OS Extended Properties descriptors support usb: gadget: f_uac2: don't queue new requests when shutting down Andy Shevchenko (2): usb: dwc3: no need to initialize ret variable usb: dwc3: convert to pcim_enable_device() Apelete Seketeli (1): documentation: docbook: document process of writing an musb glue layer Arnd Bergmann (4): usb: gadget: s3c2410_udc: don't use pr_debug return value usb: musb: tusb-dma can't be built-in if tusb is not usb: musb: omap2plus bus glue needs USB host support usb: phy: msm: reset controller is mandatory now Dan Carpenter (1): usb: phy: msm: change devm_ioremap() to devm_ioremap_resource() Daniel Mack (3): usb: musb: add reset hook to platform ops usb: musb: add a work_struct to recover from babble errors usb: musb: dsps: handle babble interrupts Duan Jiong (1): usb: gadget: f_subset: replace PTR_RET with PTR_ERR_OR_ZERO Felipe Balbi (16): usb: dwc3: gadget: clear stall when disabling endpoint usb: dwc3: core: refactor PHY initialization usb: phy: mv-u3d: switch over to writel/readl usb: dwc3: core: refactor mode initialization to its own function usb: gadget: only GPL drivers in the gadget and phy framework usb: phy: rename usb_nop_xceiv to usb_phy_generic usb: phy: rename <linux/usb/usb_phy_gen_xceiv.h> to <linux/usb/usb_phy_generic.h> usb: musb: move usb_phy_generic_{un,}register calls to probe()/remove() usb: phy: generic: allow multiples calls to usb_phy_generic_register() usb: phy: generic: switch over to IS_ENABLED() usb: dwc3: gadget: print both cmd string and number usb: dwc3: gadget: pretty print link states usb: dwc3: gadget: pretty print Generic CMDs usb: phy: msm: cast to enum msm_usb_phy_type usb: phy: msm: switch over to writel() usb: phy: msm: enable build on other architectures George Cherian (1): usb: musb: Kconfig: Select the DMA driver if DMA mode of MUSB is enabled Ivan T. Ivanov (17): usb: phy: msm: Make driver selectable on ARCH_QCOM usb: phy: msm: Move global regulators variables to driver state usb: phy: msm: Enable deferred driver probing usb: phy: msm: Migrate to Managed Device Resource allocation usb: phy: msm: Remove unnecessarily check for valid regulators. usb: phy: msm: Fix checkpatch.pl warnings usb: phy: msm: Replace custom enum usb_mode_type with enum usb_dr_mode usb: phy: msm: Remove unused pclk_src_name usb: phy: msm: Remove HSUSB prefix from regulator names usb: phy: msm: Properly check result from platform_get_irq() usb: phy: msm: Add device tree support and binding information usb: phy: msm: Use reset framework for LINK and PHY resets usb: phy: msm: Add support for secondary PHY control usb: phy: msm: Correct USB PHY Reset sequence for newer platform usb: phy: msm: Handle disconnect events usb: phy: msm: Vote for corner of VDD CX instead of voltage of VDD CX usb: phy: msm: Use usb_add_phy_dev() to register device Jean Delvare (1): usb: dwc3: add glue layer dependencies Jingoo Han (8): usb: gadget: f_uac2: remove unnecessary OOM messages usb: gadget: fotg210-udc: remove unnecessary OOM messages usb: gadget: fsl_udc_core: remove unnecessary OOM messages usb: gadget: fusb300_udc: remove unnecessary OOM messages usb: gadget: m66592-udc: remove unnecessary OOM messages usb: gadget: mv_u3d_core: remove unnecessary OOM messages usb: gadget: r8a66597-udc: remove unnecessary OOM messages usb: gadget: tcm_usb_gadget: remove unnecessary OOM messages Laurent Pinchart (3): usb: gadget: uvc: Switch to monotonic clock for buffer timestamps usb: gadget: uvc: Set the V4L2 buffer field to V4L2_FIELD_NONE usb: gadget: uvc: Set the vb2 queue timestamp flags Liviu Dudau (1): usb: phy: Add SMSC USB334x PHY ID Matwey V. Kornilov (2): usb: musb: tusb6010: Add tusb_revision to struct musb to store the revision. usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call. Paul Bolle (1): usb: musb: tusb: remove dead code Peter Chen (3): usb: gadget: set gadget state as configured usb: udc-core: set gadget state as not attached after unloading module usb: gadget: configfs: fix typo Ricardo Ribalda Delgado (1): usb: gadget: net2280: Fix NULL pointer dereference Robert Baldyga (1): tools: usb: aio example applications Tim Bird (2): usb: phy: msm: Fix PTS definitions for MSM USB controller usb: phy: msm: Select secondary PHY via TCSR Vivek Gautam (1): usb: dwc3: exynos: Make provision for vdd regulators Wolfram Sang (1): usb: musb: dsps: compile suspend/resume only with PM_SLEEP Documentation/ABI/testing/configfs-usb-gadget | 45 ++ Documentation/DocBook/Makefile | 3 +- Documentation/DocBook/writing_musb_glue_layer.tmpl | 873 +++++++++++++++++++++ Documentation/devicetree/bindings/usb/gr-udc.txt | 22 +- .../devicetree/bindings/usb/msm-hsusb.txt | 78 ++ arch/arm/mach-msm/board-msm7x30.c | 2 +- arch/arm/mach-msm/board-qsd8x50.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 1 - arch/arm/mach-omap2/usb-host.c | 10 +- drivers/usb/dwc3/Kconfig | 4 +- drivers/usb/dwc3/core.c | 253 +++--- drivers/usb/dwc3/dwc3-exynos.c | 71 +- drivers/usb/dwc3/dwc3-omap.c | 2 +- drivers/usb/dwc3/dwc3-pci.c | 21 +- drivers/usb/dwc3/gadget.c | 83 +- drivers/usb/gadget/atmel_usba_udc.c | 2 +- drivers/usb/gadget/composite.c | 318 +++++++- drivers/usb/gadget/configfs.c | 556 ++++++++++++- drivers/usb/gadget/configfs.h | 12 + drivers/usb/gadget/f_fs.c | 33 +- drivers/usb/gadget/f_rndis.c | 33 +- drivers/usb/gadget/f_subset.c | 2 +- drivers/usb/gadget/f_uac2.c | 10 +- drivers/usb/gadget/fotg210-udc.c | 8 +- drivers/usb/gadget/fsl_udc_core.c | 8 +- drivers/usb/gadget/fusb300_udc.c | 8 +- drivers/usb/gadget/gr_udc.c | 55 +- drivers/usb/gadget/inode.c | 1 + drivers/usb/gadget/m66592-udc.c | 1 - drivers/usb/gadget/mv_u3d_core.c | 14 +- drivers/usb/gadget/net2280.c | 4 +- drivers/usb/gadget/r8a66597-udc.c | 1 - drivers/usb/gadget/rndis.c | 28 +- drivers/usb/gadget/s3c2410_udc.c | 3 +- drivers/usb/gadget/storage_common.c | 52 +- drivers/usb/gadget/tcm_usb_gadget.c | 16 +- drivers/usb/gadget/u_ether.c | 32 +- drivers/usb/gadget/u_f.c | 2 +- drivers/usb/gadget/u_f.h | 26 + drivers/usb/gadget/u_os_desc.h | 90 +++ drivers/usb/gadget/u_rndis.h | 3 + drivers/usb/gadget/udc-core.c | 2 + drivers/usb/gadget/uvc_queue.c | 12 +- drivers/usb/host/Kconfig | 1 - drivers/usb/musb/Kconfig | 5 +- drivers/usb/musb/am35x.c | 14 +- drivers/usb/musb/blackfin.c | 14 +- drivers/usb/musb/da8xx.c | 16 +- drivers/usb/musb/davinci.c | 8 +- drivers/usb/musb/musb_core.c | 35 + drivers/usb/musb/musb_core.h | 9 + drivers/usb/musb/musb_dsps.c | 29 +- drivers/usb/musb/tusb6010.c | 28 +- drivers/usb/musb/tusb6010.h | 8 - drivers/usb/musb/tusb6010_omap.c | 2 +- drivers/usb/phy/Kconfig | 7 +- drivers/usb/phy/phy-am335x.c | 4 +- drivers/usb/phy/phy-generic.c | 65 +- drivers/usb/phy/phy-generic.h | 8 +- drivers/usb/phy/phy-keystone.c | 4 +- drivers/usb/phy/phy-msm-usb.c | 700 ++++++++++------- drivers/usb/phy/phy-mv-u3d-usb.c | 20 +- drivers/usb/phy/phy-ulpi.c | 1 + include/linux/usb/composite.h | 79 ++ include/linux/usb/msm_hsusb.h | 39 +- include/linux/usb/msm_hsusb_hw.h | 14 +- .../usb/{usb_phy_gen_xceiv.h => usb_phy_generic.h} | 13 +- .../multibuff/device_app/aio_multibuff.c | 349 ++++++++ .../ffs-aio-example/multibuff/host_app/Makefile | 13 + .../usb/ffs-aio-example/multibuff/host_app/test.c | 146 ++++ .../ffs-aio-example/simple/device_app/aio_simple.c | 335 ++++++++ tools/usb/ffs-aio-example/simple/host_app/Makefile | 13 + tools/usb/ffs-aio-example/simple/host_app/test.c | 148 ++++ 73 files changed, 4132 insertions(+), 797 deletions(-) create mode 100644 Documentation/DocBook/writing_musb_glue_layer.tmpl create mode 100644 drivers/usb/gadget/u_os_desc.h rename include/linux/usb/{usb_phy_gen_xceiv.h => usb_phy_generic.h} (53%) create mode 100644 tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c create mode 100644 tools/usb/ffs-aio-example/multibuff/host_app/Makefile create mode 100644 tools/usb/ffs-aio-example/multibuff/host_app/test.c create mode 100644 tools/usb/ffs-aio-example/simple/device_app/aio_simple.c create mode 100644 tools/usb/ffs-aio-example/simple/host_app/Makefile create mode 100644 tools/usb/ffs-aio-example/simple/host_app/test.c