[U-Boot] [PULL] u-boot-usb/master

The following changes since commit f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
Prepare v2015.04 (2015-04-13 10:53:03 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git HEAD
for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca:
usb: gadget: thor: Claim EP after allocating it in thor gadget (2015-04-14 05:48:12 +0200)
---------------------------------------------------------------- Franck Jullien (1): usb_storage : scan all interfaces to find a storage device
Inha Song (2): usb: gadget: UMS: Invoke board specific USB cleanup interface usb: gadget: thor: Invoke board specific USB cleanup interface
Joonyoung Shim (1): usb: dwc3: make dwc3_set_mode to static
Kishon Vijay Abraham I (40): ARM: DRA7: Enable clocks for USB OTGSS and USB PHY ARM: AM43xx: Enable clocks for USB OTGSS and USB PHY usb: gadget: udc: add udc-core from linux kernel to u-boot include: usb: modify gadget.h to include udc support usb: gadget: udc: make udc-core compile in u-boot build include: asm: dma-mapping: get rid of the compilation warning in udc-core usb: dwc3: add dwc3 folder from linux kernel to u-boot usb: dwc3: remove un-used files from dwc3 folder usb: dwc3: Modify the file headers to u-boot format usb: dwc3: remove trace_* APIs from dwc3 driver usb: dwc3: fix dwc3 header files usb: dwc3: remove pm related operations from dwc3 driver arm: asm: dma-mapping: added dma_free_coherent API usb: dwc3: linux-compat: Add header for dwc3 linux compatibiltiy usb: dwc3: gadget: make dwc3 gadget build in uboot include: asm: types: add resource_size_t type usb: dwc3: ep0: make dwc3 ep0 build in uboot include: usb: composite: add USB_GADGET_DELAYED_STATUS to avoid compilation error usb: dwc3: core: make dwc3 core build in uboot include: dwc3-uboot: add a structure for populating platform data dwc3: core: change probe and remove to uboot init and uboot exit code dwc3: core: add support for multiple dwc3 controllers dwc3: core: added an API to invoke irq handlers usb: dwc3: dwc3-omap: make dwc3-omap build in uboot include: dwc3-omap-uboot: add a structure for populating dwc3-omap platform data usb: dwc3: dwc3-omap: change probe and remove to uboot init and uboot exit code dwc3: dwc3-omap: add support for multiple dwc3-omap controllers usb: dwc3: dwc3-omap: add interrupt status API to check for interrupts usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms dwc3: flush the buffers before using it usb: dwc3: ep0: preparation for implementing chained TRB usb: dwc3: Add chained TRB support for ep0 usb: dwc3: Makefile: Make dwc3 driver compile in u-boot usb: gadget: defer setting maxpacket till ->setup() common: cmd_dfu: invoke board_usb_cleanup() for cleaning up board: ti: DRA7: added USB initializtion code include: configs: Enable DWC3 and DFU in DRA7xx board: ti: AM43xx: added USB initializtion code include: configs: Enable DWC3 and DFU in AM43xx usb: modify usb_gadget_handle_interrupts to take controller index
Marek Szyprowski (4): usb: dwc3: add a workaround for too small OUT requests usb: dwc3: gadget: add common endpoint configuration for dwc3 udc driver usb: dwc3: optimize interrupt loop usb: gadget: thor: Claim EP after allocating it in thor gadget
Paul Kocialkowski (3): usb: usb_new_device return codes consistency usb: Check usb_new_device for failure usb: Early failure when the first descriptor read fails or is invalid
Rob Herring (2): usb: ci_udc: fix warnings on 64-bit builds ehci-hcd: fix warnings on 64-bit builds
Sergey Temerkhanov (3): usb: Convert protocol header structures to use explicitly sized variables usb: 64-bit architectures support for xHCI usb_storage:Fix USB storage capacity detection on 64 bit architectures
Stephen Warren (17): usb: fix first descriptor fetch error handling usb: dwc2: unify waiting for transfer completion usb: dwc2: refactor submit_bulk_msg to be common usb: dwc2: usb chunk_msg() for control transfers too usb: dwc2: remove control_data_toggle[] usb: dwc2: simplify wait_for_chhltd usb: dwc2: fix aligned buffer usage usb: dwc2: remove restriction on buffer length usb: dwc2: fix bulk transfers Create API to map between CPU physical and bus addresses ARM: bcm2835: implement phys_to_bus/bus_to_phys usb: dwc2: use phys_to_bus/bus_to_phys usb: dwc2: detect device speed correctly ARM: bcm2835: use phys_to_bus() for mbox usb: dwc2: correctly program hcchar for LS devices usb: dwc2: implement interrupt transfers usb: dwc2: retry NAK'd interrupt transfers
Thierry Reding (3): usb: eth: asix: Build warning fixes for 64-bit usb: ehci-tegra: Build warning fixes for 64-bit usb: mass-storage: Build warning fixes for 64-bit
Tim Harvey (1): usb: hub: allow pgood_delay to be specified via env
Łukasz Majewski (7): usb: board: samsung: Add default board_usb_cleanup() definition for Exynos SoCs usb: board: goni: Add default board_usb_cleanup() definition for Goni board usb: composite: Add .reset callback to usb_gadget_driver structure usb: dwc3: Remove BIT(x) macro from DWC3's gadget code usb: dwc3: gadget: Set all ctrl fields of Transfer Control Blocks (TRB) to be LST usb: dwc3: gadget: Set non EP0 max packet limit to 512B usb: dwc3: Correct clean up code for requests
Makefile | 2 + arch/arm/cpu/armv7/am33xx/clock_am43xx.c | 12 + arch/arm/cpu/armv7/omap5/hw_data.c | 14 + arch/arm/cpu/armv7/omap5/prcm-regs.c | 10 +- arch/arm/include/asm/arch-am33xx/cpu.h | 20 +- arch/arm/include/asm/arch-am33xx/hardware_am43xx.h | 12 + arch/arm/include/asm/arch-omap5/omap.h | 12 + arch/arm/include/asm/dma-mapping.h | 9 +- arch/arm/include/asm/omap_common.h | 4 +- arch/arm/include/asm/types.h | 1 + arch/arm/mach-bcm283x/Kconfig | 3 + arch/arm/mach-bcm283x/Makefile | 2 +- arch/arm/mach-bcm283x/mbox.c | 5 +- arch/arm/mach-bcm283x/phys2bus.c | 22 + board/samsung/common/board.c | 6 + board/samsung/goni/goni.c | 5 + board/ti/am43xx/board.c | 108 ++++ board/ti/dra7xx/evm.c | 109 ++++ common/cmd_dfu.c | 3 +- common/cmd_fastboot.c | 2 +- common/cmd_thordown.c | 1 + common/cmd_usb_mass_storage.c | 3 +- common/usb.c | 98 ++-- common/usb_hub.c | 8 + common/usb_storage.c | 89 +-- drivers/Kconfig | 8 + drivers/usb/dwc3/Makefile | 8 + drivers/usb/dwc3/core.c | 785 +++++++++++++++++++++++++ drivers/usb/dwc3/core.h | 1032 +++++++++++++++++++++++++++++++++ drivers/usb/dwc3/dwc3-omap.c | 441 ++++++++++++++ drivers/usb/dwc3/ep0.c | 1112 ++++++++++++++++++++++++++++++++++++ drivers/usb/dwc3/gadget.c | 2678 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/dwc3/gadget.h | 108 ++++ drivers/usb/dwc3/io.h | 55 ++ drivers/usb/dwc3/linux-compat.h | 38 ++ drivers/usb/dwc3/ti_usb_phy.c | 309 ++++++++++ drivers/usb/eth/asix.c | 2 +- drivers/usb/gadget/atmel_usba_udc.c | 2 +- drivers/usb/gadget/ci_udc.c | 44 +- drivers/usb/gadget/composite.c | 5 +- drivers/usb/gadget/epautoconf.c | 24 +- drivers/usb/gadget/ether.c | 12 +- drivers/usb/gadget/f_mass_storage.c | 4 +- drivers/usb/gadget/f_thor.c | 9 +- drivers/usb/gadget/fotg210.c | 2 +- drivers/usb/gadget/gadget_chips.h | 8 + drivers/usb/gadget/pxa25x_udc.c | 2 +- drivers/usb/gadget/s3c_udc_otg.c | 2 +- drivers/usb/gadget/udc/Makefile | 4 + drivers/usb/gadget/udc/udc-core.c | 354 ++++++++++++ drivers/usb/host/dwc2.c | 369 +++++------- drivers/usb/host/dwc2.h | 3 + drivers/usb/host/ehci-hcd.c | 82 +-- drivers/usb/host/ehci-tegra.c | 8 +- drivers/usb/host/xhci-mem.c | 20 +- drivers/usb/host/xhci-ring.c | 30 +- drivers/usb/host/xhci.c | 10 +- drivers/usb/host/xhci.h | 13 +- drivers/usb/musb-new/musb_uboot.c | 2 +- include/configs/am43xx_evm.h | 58 +- include/configs/dra7xx_evm.h | 63 ++ include/configs/ti_omap5_common.h | 5 + include/dwc3-omap-uboot.h | 32 ++ include/dwc3-uboot.h | 42 ++ include/linux/compat.h | 1 + include/linux/usb/composite.h | 9 + include/linux/usb/dwc3-omap.h | 19 + include/linux/usb/gadget.h | 84 ++- include/linux/usb/otg.h | 20 + include/phys2bus.h | 25 + include/ti-usb-phy-uboot.h | 22 + include/usb.h | 18 +- 72 files changed, 8096 insertions(+), 447 deletions(-) create mode 100644 arch/arm/mach-bcm283x/phys2bus.c create mode 100644 drivers/usb/dwc3/Makefile create mode 100644 drivers/usb/dwc3/core.c create mode 100644 drivers/usb/dwc3/core.h create mode 100644 drivers/usb/dwc3/dwc3-omap.c create mode 100644 drivers/usb/dwc3/ep0.c create mode 100644 drivers/usb/dwc3/gadget.c create mode 100644 drivers/usb/dwc3/gadget.h create mode 100644 drivers/usb/dwc3/io.h create mode 100644 drivers/usb/dwc3/linux-compat.h create mode 100644 drivers/usb/dwc3/ti_usb_phy.c create mode 100644 drivers/usb/gadget/udc/Makefile create mode 100644 drivers/usb/gadget/udc/udc-core.c create mode 100644 include/dwc3-omap-uboot.h create mode 100644 include/dwc3-uboot.h create mode 100644 include/linux/usb/dwc3-omap.h create mode 100644 include/linux/usb/otg.h create mode 100644 include/phys2bus.h create mode 100644 include/ti-usb-phy-uboot.h

On Tue, Apr 14, 2015 at 05:50:50AM +0200, Marek Vasut wrote:
The following changes since commit f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
Prepare v2015.04 (2015-04-13 10:53:03 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git HEAD
for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca:
usb: gadget: thor: Claim EP after allocating it in thor gadget (2015-04-14 05:48:12 +0200)
So this and the DM pull request conflict pretty badly. I can fixup everything but common/usb_storage.c with a pretty good degree of confidence. But in that case it looks like DM is trying to do something similar to what came in also via the USB tree (better / wider probing, roughly). How do you guys want to handle this? Thanks!

Hi Tom,
On 15 April 2015 at 07:08, Tom Rini trini@konsulko.com wrote:
On Tue, Apr 14, 2015 at 05:50:50AM +0200, Marek Vasut wrote:
The following changes since commit f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
Prepare v2015.04 (2015-04-13 10:53:03 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git HEAD
for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca:
usb: gadget: thor: Claim EP after allocating it in thor gadget (2015-04-14 05:48:12 +0200)
So this and the DM pull request conflict pretty badly. I can fixup everything but common/usb_storage.c with a pretty good degree of confidence. But in that case it looks like DM is trying to do something similar to what came in also via the USB tree (better / wider probing, roughly). How do you guys want to handle this? Thanks!
If it is mostly this patch:
usb_storage : scan all interfaces to find a storage device
then you could drop it and I could tidy it up and resend. But I'm not sure what the conflicts are. There's a lot of non-USB stuff in the DM pull request so I'm reluctant to unpick and retest. But we'll have to do something. Marek what do you think?
Regards, Simon

On Wed, Apr 15, 2015 at 07:29:41AM -0600, Simon Glass wrote:
Hi Tom,
On 15 April 2015 at 07:08, Tom Rini trini@konsulko.com wrote:
On Tue, Apr 14, 2015 at 05:50:50AM +0200, Marek Vasut wrote:
The following changes since commit f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
Prepare v2015.04 (2015-04-13 10:53:03 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git HEAD
for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca:
usb: gadget: thor: Claim EP after allocating it in thor gadget (2015-04-14 05:48:12 +0200)
So this and the DM pull request conflict pretty badly. I can fixup everything but common/usb_storage.c with a pretty good degree of confidence. But in that case it looks like DM is trying to do something similar to what came in also via the USB tree (better / wider probing, roughly). How do you guys want to handle this? Thanks!
If it is mostly this patch:
usb_storage : scan all interfaces to find a storage device
then you could drop it and I could tidy it up and resend. But I'm not sure what the conflicts are. There's a lot of non-USB stuff in the DM pull request so I'm reluctant to unpick and retest. But we'll have to do something. Marek what do you think?
Dropping that patch makes the rest of the rejects much easier to understand, FWIW.

On Wednesday, April 15, 2015 at 03:43:37 PM, Tom Rini wrote:
On Wed, Apr 15, 2015 at 07:29:41AM -0600, Simon Glass wrote:
Hi Tom,
On 15 April 2015 at 07:08, Tom Rini trini@konsulko.com wrote:
On Tue, Apr 14, 2015 at 05:50:50AM +0200, Marek Vasut wrote:
The following changes since commit
f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
Prepare v2015.04 (2015-04-13 10:53:03 -0400)
are available in the git repository at: git://git.denx.de/u-boot-usb.git HEAD
for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca: usb: gadget: thor: Claim EP after allocating it in thor gadget (2015-04-14
05:48:12 +0200)
So this and the DM pull request conflict pretty badly. I can fixup everything but common/usb_storage.c with a pretty good degree of confidence. But in that case it looks like DM is trying to do something similar to what came in also via the USB tree (better / wider probing, roughly). How do you guys want to handle this? Thanks!
If it is mostly this patch: usb_storage : scan all interfaces to find a storage device
then you could drop it and I could tidy it up and resend. But I'm not sure what the conflicts are. There's a lot of non-USB stuff in the DM pull request so I'm reluctant to unpick and retest. But we'll have to do something. Marek what do you think?
Dropping that patch makes the rest of the rejects much easier to understand, FWIW.
Feel free to drop it then, but please notify the author to rebase it and repost .
Thanks!
Best regards, Marek Vasut

Hi Tom,
On 15 April 2015 at 12:16, Marek Vasut marex@denx.de wrote:
On Wednesday, April 15, 2015 at 03:43:37 PM, Tom Rini wrote:
On Wed, Apr 15, 2015 at 07:29:41AM -0600, Simon Glass wrote:
Hi Tom,
On 15 April 2015 at 07:08, Tom Rini trini@konsulko.com wrote:
On Tue, Apr 14, 2015 at 05:50:50AM +0200, Marek Vasut wrote:
The following changes since commit
f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
Prepare v2015.04 (2015-04-13 10:53:03 -0400)
are available in the git repository at: git://git.denx.de/u-boot-usb.git HEAD
for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca: usb: gadget: thor: Claim EP after allocating it in thor gadget (2015-04-14
05:48:12 +0200)
So this and the DM pull request conflict pretty badly. I can fixup everything but common/usb_storage.c with a pretty good degree of confidence. But in that case it looks like DM is trying to do something similar to what came in also via the USB tree (better / wider probing, roughly). How do you guys want to handle this? Thanks!
If it is mostly this patch: usb_storage : scan all interfaces to find a storage device
then you could drop it and I could tidy it up and resend. But I'm not sure what the conflicts are. There's a lot of non-USB stuff in the DM pull request so I'm reluctant to unpick and retest. But we'll have to do something. Marek what do you think?
Dropping that patch makes the rest of the rejects much easier to understand, FWIW.
Feel free to drop it then, but please notify the author to rebase it and repost .
Is this looking OK? Do you need me to do anything to get the two pull requests in?
Regards, Simon

On Tue, Apr 14, 2015 at 05:50:50AM +0200, Marek Vasut wrote:
The following changes since commit f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
Prepare v2015.04 (2015-04-13 10:53:03 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git HEAD
for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca:
usb: gadget: thor: Claim EP after allocating it in thor gadget (2015-04-14 05:48:12 +0200)
As this was part of u-boot-dfu PR as well and I didn't notice (oops..), applied to u-boot/master, thanks!
participants (3)
-
Marek Vasut
-
Simon Glass
-
Tom Rini