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

The following changes since commit 44fb0d6c9f5147a41c710032869e5e01b3c9e310:
Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze (2019-10-09 16:22:03 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 3cf0f7a8d485e4bf969628f5658e075084b2f013:
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs (2019-10-12 13:07:32 +0200)
---------------------------------------------------------------- Igor Opaniuk (1): usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs
Jean-Jacques Hiblot (15): usb: host: remove the xhci-zynqmp driver usb: dwc3: switch to peripheral mode when exiting usb: xhci: move xhci.h to include usb usb: dwc3: always use the inlined version of dwc3_host_init/dwc3_host_exit usb: dwc3-generic: use platdata usb: dwc3-generic: factorize code usb: dwc3-generic: add a new host driver that uses the dwc3 core usb: dwc3-generic: if no max speed is specified in DT, assume super speed usb: dwc3: Add dwc3_of_parse() to get quirks information from DT usb: dwc3: Kconfig: get rid of obsolete mode selection ARM: keystone: increase PSC timeout ARM: keystone: Do not enable the USB power domains at the board level phy: keystone-usb: handle the transition of the USB power domain configs: k2g_evm_defconfig: disable XHCI_DWC3 and enable KEYSTONE_USB_PHY ARM: DTS: keystone: complete the description of the USB PHY devices
MAINTAINERS | 1 + arch/arm/dts/keystone-k2e-evm-u-boot.dtsi | 32 +++++++++++++++++++ arch/arm/dts/keystone-k2g-evm-u-boot.dtsi | 28 ++++++++++++++++ arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi | 14 ++++++++ arch/arm/dts/keystone-k2l-evm-u-boot.dtsi | 18 +++++++++++ arch/arm/mach-keystone/include/mach/psc_defs.h | 2 +- board/ti/ks2_evm/board.c | 13 -------- configs/avnet_ultra96_rev1_defconfig | 1 - configs/evb-rk3328_defconfig | 1 + configs/k2g_evm_defconfig | 3 +- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 - configs/xilinx_zynqmp_zcu100_revC_defconfig | 1 - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 - configs/xilinx_zynqmp_zcu104_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu104_revC_defconfig | 1 - configs/xilinx_zynqmp_zcu106_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu111_revA_defconfig | 1 - drivers/phy/keystone-usb-phy.c | 22 +++++++++++++ drivers/usb/dwc3/Kconfig | 18 ++--------- drivers/usb/dwc3/core.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++-- drivers/usb/dwc3/core.h | 6 +--- drivers/usb/dwc3/dwc3-generic.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- drivers/usb/host/Kconfig | 7 ---- drivers/usb/host/Makefile | 1 - drivers/usb/host/ehci-mx6.c | 15 +++++---- drivers/usb/host/xhci-dwc3.c | 2 +- drivers/usb/host/xhci-exynos5.c | 2 +- drivers/usb/host/xhci-fsl.c | 2 +- drivers/usb/host/xhci-mem.c | 2 +- drivers/usb/host/xhci-mvebu.c | 2 +- drivers/usb/host/xhci-omap.c | 2 +- drivers/usb/host/xhci-pci.c | 2 +- drivers/usb/host/xhci-rcar.c | 2 +- drivers/usb/host/xhci-ring.c | 2 +- drivers/usb/host/xhci-rockchip.c | 2 +- drivers/usb/host/xhci-zynqmp.c | 146 ------------------------------------------------------------------------------------ drivers/usb/host/xhci.c | 2 +- drivers/usb/phy/omap_usb_phy.c | 2 +- {drivers/usb/host => include/usb}/xhci.h | 0 43 files changed, 335 insertions(+), 258 deletions(-) create mode 100644 arch/arm/dts/keystone-k2l-evm-u-boot.dtsi delete mode 100644 drivers/usb/host/xhci-zynqmp.c rename {drivers/usb/host => include/usb}/xhci.h (100%)

On Tue, Oct 15, 2019 at 01:34:57AM +0200, Marek Vasut wrote:
The following changes since commit 44fb0d6c9f5147a41c710032869e5e01b3c9e310:
Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze (2019-10-09 16:22:03 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 3cf0f7a8d485e4bf969628f5658e075084b2f013:
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs (2019-10-12 13:07:32 +0200)
NAK. From: https://gitlab.denx.de/u-boot/u-boot/-/jobs/19870 sei510 rock64-rk3328 u200 odroid-n2 fail due to: +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_register_driver': +drivers/usb/gadget/udc/udc-core.c:325: multiple definition of `usb_gadget_register_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:238: first defined here +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_unregister_driver': +drivers/usb/gadget/udc/udc-core.c:334: multiple definition of `usb_gadget_unregister_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:287: first defined here

On 10/15/19 2:59 AM, Tom Rini wrote:
On Tue, Oct 15, 2019 at 01:34:57AM +0200, Marek Vasut wrote:
The following changes since commit 44fb0d6c9f5147a41c710032869e5e01b3c9e310:
Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze (2019-10-09 16:22:03 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 3cf0f7a8d485e4bf969628f5658e075084b2f013:
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs (2019-10-12 13:07:32 +0200)
NAK. From: https://gitlab.denx.de/u-boot/u-boot/-/jobs/19870 sei510 rock64-rk3328 u200 odroid-n2 fail due to: +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_register_driver': +drivers/usb/gadget/udc/udc-core.c:325: multiple definition of `usb_gadget_register_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:238: first defined here +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_unregister_driver': +drivers/usb/gadget/udc/udc-core.c:334: multiple definition of `usb_gadget_unregister_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:287: first defined here
Sigh, +CC Jean.

Hi Marek,
On 15/10/2019 03:01, Marek Vasut wrote:
On 10/15/19 2:59 AM, Tom Rini wrote:
On Tue, Oct 15, 2019 at 01:34:57AM +0200, Marek Vasut wrote:
The following changes since commit 44fb0d6c9f5147a41c710032869e5e01b3c9e310:
Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze (2019-10-09 16:22:03 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 3cf0f7a8d485e4bf969628f5658e075084b2f013:
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs (2019-10-12 13:07:32 +0200)
NAK. From: https://gitlab.denx.de/u-boot/u-boot/-/jobs/19870 sei510 rock64-rk3328 u200 odroid-n2 fail due to: +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_register_driver': +drivers/usb/gadget/udc/udc-core.c:325: multiple definition of `usb_gadget_register_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:238: first defined here +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_unregister_driver': +drivers/usb/gadget/udc/udc-core.c:334: multiple definition of `usb_gadget_unregister_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:287: first defined here
Sigh, +CC Jean.
Looks like v3 has been merged instead of the latest v4 which has the changes in defconfig to prevent this.
v4: https://patchwork.ozlabs.org/project/uboot/list/?series=130132
v3: https://patchwork.ozlabs.org/project/uboot/list/?series=116460&state=*
Changes in v4: - removed patches already merged (DWC3 fixes) - update more defconfigs (u200, sei510, rock64-rk332 and odroid-n2) - Fix the test of the USB_DWC3_GADGET option. IS_ENABLED() requires the whole option name including the 'CONFIG_' prefix
JJ

On 15/10/2019 11:36, Jean-Jacques Hiblot wrote:
Hi Marek,
On 15/10/2019 03:01, Marek Vasut wrote:
On 10/15/19 2:59 AM, Tom Rini wrote:
On Tue, Oct 15, 2019 at 01:34:57AM +0200, Marek Vasut wrote:
The following changes since commit 44fb0d6c9f5147a41c710032869e5e01b3c9e310:
Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze (2019-10-09 16:22:03 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 3cf0f7a8d485e4bf969628f5658e075084b2f013:
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs (2019-10-12 13:07:32 +0200)
NAK. From: https://gitlab.denx.de/u-boot/u-boot/-/jobs/19870 sei510 rock64-rk3328 u200 odroid-n2 fail due to: +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_register_driver': +drivers/usb/gadget/udc/udc-core.c:325: multiple definition of `usb_gadget_register_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:238: first defined here +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_unregister_driver': +drivers/usb/gadget/udc/udc-core.c:334: multiple definition of `usb_gadget_unregister_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:287: first defined here
Sigh, +CC Jean.
Looks like v3 has been merged instead of the latest v4 which has the changes in defconfig to prevent this.
v4: https://patchwork.ozlabs.org/project/uboot/list/?series=130132
v3: https://patchwork.ozlabs.org/project/uboot/list/?series=116460&state=*
Changes in v4:
- removed patches already merged (DWC3 fixes)
- update more defconfigs (u200, sei510, rock64-rk332 and odroid-n2)
- Fix the test of the USB_DWC3_GADGET option. IS_ENABLED() requires the
whole option name including the 'CONFIG_' prefix
JJ
Travis build with v4 rebased on top of u-boot-usb/master (minus the v3 patches): https://travis-ci.org/jjhiblot/u-boot/jobs/598065745
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot

On 10/15/19 6:59 PM, Jean-Jacques Hiblot wrote:
On 15/10/2019 11:36, Jean-Jacques Hiblot wrote:
Hi Marek,
On 15/10/2019 03:01, Marek Vasut wrote:
On 10/15/19 2:59 AM, Tom Rini wrote:
On Tue, Oct 15, 2019 at 01:34:57AM +0200, Marek Vasut wrote:
The following changes since commit 44fb0d6c9f5147a41c710032869e5e01b3c9e310:
Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze (2019-10-09 16:22:03 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 3cf0f7a8d485e4bf969628f5658e075084b2f013:
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs (2019-10-12 13:07:32 +0200)
NAK. From: https://gitlab.denx.de/u-boot/u-boot/-/jobs/19870 sei510 rock64-rk3328 u200 odroid-n2 fail due to: +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_register_driver': +drivers/usb/gadget/udc/udc-core.c:325: multiple definition of `usb_gadget_register_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:238: first defined here +drivers/usb/gadget/udc/built-in.o: In function `usb_gadget_unregister_driver': +drivers/usb/gadget/udc/udc-core.c:334: multiple definition of `usb_gadget_unregister_driver' +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:287: first defined here
Sigh, +CC Jean.
Looks like v3 has been merged instead of the latest v4 which has the changes in defconfig to prevent this.
v4: https://patchwork.ozlabs.org/project/uboot/list/?series=130132
v3: https://patchwork.ozlabs.org/project/uboot/list/?series=116460&state=*
Changes in v4:
- removed patches already merged (DWC3 fixes)
- update more defconfigs (u200, sei510, rock64-rk332 and odroid-n2)
- Fix the test of the USB_DWC3_GADGET option. IS_ENABLED() requires the
whole option name including the 'CONFIG_' prefix
JJ
Travis build with v4 rebased on top of u-boot-usb/master (minus the v3 patches): https://travis-ci.org/jjhiblot/u-boot/jobs/598065745
I loaded the V4 into travis too, thanks.
participants (3)
-
Jean-Jacques Hiblot
-
Marek Vasut
-
Tom Rini