[PATCH 0/2] mach-meson: port dwc2_otg usage to CONFIG_DM_USB_GADGET=y
While working on some USB bugs on the VIM3L board, we stumbled upon the fact that mach-meson still uses legacy board_usb_*() functions instead of using DM [1]
This series aim to switch the g12a based boards to use CONFIG_DM_USB_GADGET and removes the board_usb_*() logic.
* The first patch adds mode switching in the dwc3-meson-g12a glue driver whenever the dwc2 otg driver is probed()/removed().
* The second patch enables the config option and cleans up all board_usb_*().
This has been mainly tested with khadas-vim3l_android_defconfig using fastboot:
=> fastboot usb 0
=> # hit Ctrl-c
Other tests: * ums 0 mmc 2 # can list / mount partitions from host * usb start; usb storage # list usb thumb drive * all defconfigs have been build tested
[1] https://lore.kernel.org/u-boot/938b9439-9014-5ee8-1627-16af508bface@linaro.o... Signed-off-by: Mattijs Korpershoek mkorpershoek@baylibre.com
--- Mattijs Korpershoek (2): usb: dwc3-meson-g12a: force mode on child add/removal ARM: meson: g12a: switch dwc2 otg to DM
arch/arm/mach-meson/board-g12a.c | 127 ------------------------------ configs/bananapi-m5_defconfig | 1 + configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/khadas-vim3_android_ab_defconfig | 1 + configs/khadas-vim3_android_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_android_ab_defconfig | 1 + configs/khadas-vim3l_android_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/sei510_defconfig | 1 + configs/sei610_defconfig | 1 + configs/u200_defconfig | 1 + drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++ 19 files changed, 35 insertions(+), 127 deletions(-) --- base-commit: 7b70f68977578360d9c47bb25d6d1937075153b4 change-id: 20221024-meson-dm-usb-60e413696519
Best regards,
arch/mach-meson has some custom usb logic, in particular: * on board_usb_init(), we force USB_DR_MODE_PERIPHERAL * on board_usb_cleanup(), we force USB_DR_MODE_HOST
With DM_USB_GADGET=y, board_usb_init/cleanup() are no longer used when we call usb_gadget_initialize(). Instead, the generic (from udc-uclass) initialization/release is called, which itself calls the controller driver's probe()/remove().
Therefore, enabling DM_USB_GADGET=y will mean that this mode switching will break.
To prepare for enabling DM_USB_GADGET, perform the mode switching when the "amlogic,meson-g12a-usb" (dwc2) driver is probed()/removed() instead.
This is achieved via the glue driver, which gets notified each time one of its children is probed()/removed.
Note: this change should be harmless without DM_USB_GADGET=y because the amlogic-g12a-usb driver is not probed via driver model.
Signed-off-by: Mattijs Korpershoek mkorpershoek@baylibre.com --- drivers/usb/dwc3/dwc3-meson-g12a.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c index 90418ddc1dab..c62e42de73f7 100644 --- a/drivers/usb/dwc3/dwc3-meson-g12a.c +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c @@ -455,6 +455,22 @@ static int dwc3_meson_g12a_remove(struct udevice *dev) return dm_scan_fdt_dev(dev); }
+static int dwc3_meson_g12a_child_pre_probe(struct udevice *dev) +{ + if (ofnode_device_is_compatible(dev_ofnode(dev), "amlogic,meson-g12a-usb")) + return dwc3_meson_g12a_force_mode(dev->parent, USB_DR_MODE_PERIPHERAL); + + return 0; +} + +static int dwc3_meson_g12a_child_post_remove(struct udevice *dev) +{ + if (ofnode_device_is_compatible(dev_ofnode(dev), "amlogic,meson-g12a-usb")) + return dwc3_meson_g12a_force_mode(dev->parent, USB_DR_MODE_HOST); + + return 0; +} + static const struct udevice_id dwc3_meson_g12a_ids[] = { { .compatible = "amlogic,meson-g12a-usb-ctrl" }, { } @@ -466,6 +482,8 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = { .of_match = dwc3_meson_g12a_ids, .probe = dwc3_meson_g12a_probe, .remove = dwc3_meson_g12a_remove, + .child_pre_probe = dwc3_meson_g12a_child_pre_probe, + .child_post_remove = dwc3_meson_g12a_child_post_remove, .plat_auto = sizeof(struct dwc3_meson_g12a),
};
With CONFIG_DM_USB_GADGET=y, we no longer need any board_usb_*() logic because: * the dwc2 driver is DM compatible, and handles its own clock enabling * the dwc3-meson-g12a glue drivers handles "force mode switching"
Remove all mach-meson/g12a usb code and enable CONFIG_DM_USB_GADGET.
Note: Only configs having both CONFIG_USB_DWC3_MESON_G12A=y *and* USB_GADGET_DWC2_OTG=y have been updated.
Signed-off-by: Mattijs Korpershoek mkorpershoek@baylibre.com --- arch/arm/mach-meson/board-g12a.c | 127 ------------------------------ configs/bananapi-m5_defconfig | 1 + configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/khadas-vim3_android_ab_defconfig | 1 + configs/khadas-vim3_android_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_android_ab_defconfig | 1 + configs/khadas-vim3l_android_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/sei510_defconfig | 1 + configs/sei610_defconfig | 1 + configs/u200_defconfig | 1 + 18 files changed, 17 insertions(+), 127 deletions(-)
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index 2e59eee8f792..d5a830fb1db8 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -17,12 +17,6 @@ #include <asm/io.h> #include <asm/armv8/mmu.h> #include <linux/sizes.h> -#include <usb.h> -#include <linux/usb/otg.h> -#include <asm/arch/usb.h> -#include <usb/dwc2_udc.h> -#include <phy.h> -#include <clk.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -96,124 +90,3 @@ static struct mm_region g12a_mem_map[] = { };
struct mm_region *mem_map = g12a_mem_map; - -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_G12A) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) -static struct dwc2_plat_otg_data meson_g12a_dwc2_data; - -int board_usb_init(int index, enum usb_init_type init) -{ - struct fdtdec_phandle_args args; - const void *blob = gd->fdt_blob; - int node, dwc2_node; - struct udevice *dev, *clk_dev; - struct clk clk; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-g12a-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, node)) { - debug("usb is disabled in the device tree\n"); - return -ENODEV; - } - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) { - debug("Not found usb-control device\n"); - return ret; - } - - /* find the dwc2 node */ - dwc2_node = fdt_node_offset_by_compatible(blob, node, - "amlogic,meson-g12a-usb"); - if (dwc2_node < 0) { - debug("Not found dwc2 node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, dwc2_node)) { - debug("dwc2 is disabled in the device tree\n"); - return -ENODEV; - } - - meson_g12a_dwc2_data.regs_otg = fdtdec_get_addr(blob, dwc2_node, "reg"); - if (meson_g12a_dwc2_data.regs_otg == FDT_ADDR_T_NONE) { - debug("usbotg: can't get base address\n"); - return -ENODATA; - } - - /* Enable clock */ - ret = fdtdec_parse_phandle_with_args(blob, dwc2_node, "clocks", - "#clock-cells", 0, 0, &args); - if (ret) { - debug("usbotg has no clocks defined in the device tree\n"); - return ret; - } - - ret = uclass_get_device_by_of_offset(UCLASS_CLK, args.node, &clk_dev); - if (ret) - return ret; - - if (args.args_count != 1) { - debug("Can't find clock ID in the device tree\n"); - return -ENODATA; - } - - clk.dev = clk_dev; - clk.id = args.args[0]; - - ret = clk_enable(&clk); - if (ret) { - debug("Failed to enable usbotg clock\n"); - return ret; - } - - meson_g12a_dwc2_data.rx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-rx-fifo-size", 0); - meson_g12a_dwc2_data.np_tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-np-tx-fifo-size", 0); - meson_g12a_dwc2_data.tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-tx-fifo-size", 0); - - /* Switch to peripheral mode */ - ret = dwc3_meson_g12a_force_mode(dev, USB_DR_MODE_PERIPHERAL); - if (ret) - return ret; - - return dwc2_udc_probe(&meson_g12a_dwc2_data); -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - const void *blob = gd->fdt_blob; - struct udevice *dev; - int node; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-g12a-usb-ctrl"); - if (node < 0) - return -ENODEV; - - if (!fdtdec_get_is_enabled(blob, node)) - return -ENODEV; - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) - return ret; - - /* Switch to OTG mode */ - ret = dwc3_meson_g12a_force_mode(dev, USB_DR_MODE_HOST); - if (ret) - return ret; - - return 0; -} -#endif diff --git a/configs/bananapi-m5_defconfig b/configs/bananapi-m5_defconfig index 6ab2d8ef0c44..49cf0495dd91 100644 --- a/configs/bananapi-m5_defconfig +++ b/configs/bananapi-m5_defconfig @@ -49,6 +49,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/beelink-gsking-x_defconfig b/configs/beelink-gsking-x_defconfig index 2c8c642dcb2d..f9fdfa41a860 100644 --- a/configs/beelink-gsking-x_defconfig +++ b/configs/beelink-gsking-x_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/beelink-gtking_defconfig b/configs/beelink-gtking_defconfig index 9848252e7e95..46bd18b666be 100644 --- a/configs/beelink-gtking_defconfig +++ b/configs/beelink-gtking_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/beelink-gtkingpro_defconfig b/configs/beelink-gtkingpro_defconfig index 484e039fe034..dbb2ce83ea95 100644 --- a/configs/beelink-gtkingpro_defconfig +++ b/configs/beelink-gtkingpro_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig index f3e9f11a8edf..6266a288bbd7 100644 --- a/configs/khadas-vim3_android_ab_defconfig +++ b/configs/khadas-vim3_android_ab_defconfig @@ -84,6 +84,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig index f076b6e4e564..ab7666c5a128 100644 --- a/configs/khadas-vim3_android_defconfig +++ b/configs/khadas-vim3_android_defconfig @@ -82,6 +82,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig index 0cf4bac809b9..bd264dd2bb15 100644 --- a/configs/khadas-vim3_defconfig +++ b/configs/khadas-vim3_defconfig @@ -70,6 +70,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig index 828ce6dee9dd..f72c7adda7f4 100644 --- a/configs/khadas-vim3l_android_ab_defconfig +++ b/configs/khadas-vim3l_android_ab_defconfig @@ -84,6 +84,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig index ee1fa5c31f82..871f77dde8cb 100644 --- a/configs/khadas-vim3l_android_defconfig +++ b/configs/khadas-vim3l_android_defconfig @@ -82,6 +82,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig index f1524f562acb..32d6a00410e4 100644 --- a/configs/khadas-vim3l_defconfig +++ b/configs/khadas-vim3l_defconfig @@ -70,6 +70,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig index d244e71866e7..3253b0a53556 100644 --- a/configs/odroid-c4_defconfig +++ b/configs/odroid-c4_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/odroid-hc4_defconfig b/configs/odroid-hc4_defconfig index fe70d5f12a16..2b6b6e9d51ad 100644 --- a/configs/odroid-hc4_defconfig +++ b/configs/odroid-hc4_defconfig @@ -68,6 +68,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MESON_SPIFC=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig index 3703d7e17cee..2fff63c753dc 100644 --- a/configs/odroid-n2_defconfig +++ b/configs/odroid-n2_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/radxa-zero_defconfig b/configs/radxa-zero_defconfig index d3744f48a31b..dcd0b9b9ffcf 100644 --- a/configs/radxa-zero_defconfig +++ b/configs/radxa-zero_defconfig @@ -45,6 +45,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/sei510_defconfig b/configs/sei510_defconfig index b26e065a3dab..36306612451f 100644 --- a/configs/sei510_defconfig +++ b/configs/sei510_defconfig @@ -70,6 +70,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/sei610_defconfig b/configs/sei610_defconfig index 2302c9eeef07..c15e81b0600b 100644 --- a/configs/sei610_defconfig +++ b/configs/sei610_defconfig @@ -70,6 +70,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/u200_defconfig b/configs/u200_defconfig index b4f2f21d7eda..cbe0f945a57d 100644 --- a/configs/u200_defconfig +++ b/configs/u200_defconfig @@ -44,6 +44,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y
Hi Mattijs,
On 23/11/2022 16:42, Mattijs Korpershoek wrote:
While working on some USB bugs on the VIM3L board, we stumbled upon the fact that mach-meson still uses legacy board_usb_*() functions instead of using DM [1]
This series aim to switch the g12a based boards to use CONFIG_DM_USB_GADGET and removes the board_usb_*() logic.
The first patch adds mode switching in the dwc3-meson-g12a glue driver whenever the dwc2 otg driver is probed()/removed().
The second patch enables the config option and cleans up all board_usb_*().
This has been mainly tested with khadas-vim3l_android_defconfig using fastboot:
=> fastboot usb 0
=> # hit Ctrl-c
Other tests:
- ums 0 mmc 2 # can list / mount partitions from host
- usb start; usb storage # list usb thumb drive
- all defconfigs have been build tested
[1] https://lore.kernel.org/u-boot/938b9439-9014-5ee8-1627-16af508bface@linaro.o... Signed-off-by: Mattijs Korpershoek mkorpershoek@baylibre.com
I'll run some tests on other G12 boards but so far this looks very good, thanks !
Neil
Mattijs Korpershoek (2): usb: dwc3-meson-g12a: force mode on child add/removal ARM: meson: g12a: switch dwc2 otg to DM
arch/arm/mach-meson/board-g12a.c | 127 ------------------------------ configs/bananapi-m5_defconfig | 1 + configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/khadas-vim3_android_ab_defconfig | 1 + configs/khadas-vim3_android_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_android_ab_defconfig | 1 + configs/khadas-vim3l_android_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/sei510_defconfig | 1 + configs/sei610_defconfig | 1 + configs/u200_defconfig | 1 + drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++ 19 files changed, 35 insertions(+), 127 deletions(-)
base-commit: 7b70f68977578360d9c47bb25d6d1937075153b4 change-id: 20221024-meson-dm-usb-60e413696519
Best regards,
Hi Neil,
On Thu, Nov 24, 2022 at 10:34, Neil Armstrong neil.armstrong@linaro.org wrote:
Hi Mattijs,
On 23/11/2022 16:42, Mattijs Korpershoek wrote:
While working on some USB bugs on the VIM3L board, we stumbled upon the fact that mach-meson still uses legacy board_usb_*() functions instead of using DM [1]
This series aim to switch the g12a based boards to use CONFIG_DM_USB_GADGET and removes the board_usb_*() logic.
The first patch adds mode switching in the dwc3-meson-g12a glue driver whenever the dwc2 otg driver is probed()/removed().
The second patch enables the config option and cleans up all board_usb_*().
This has been mainly tested with khadas-vim3l_android_defconfig using fastboot:
=> fastboot usb 0
=> # hit Ctrl-c
Other tests:
- ums 0 mmc 2 # can list / mount partitions from host
- usb start; usb storage # list usb thumb drive
- all defconfigs have been build tested
[1] https://lore.kernel.org/u-boot/938b9439-9014-5ee8-1627-16af508bface@linaro.o... Signed-off-by: Mattijs Korpershoek mkorpershoek@baylibre.com
I'll run some tests on other G12 boards but so far this looks very good, thanks !
I got my hands on an odroid-c4 board and I also tested: => fastboot usb 0 => # hit Ctrl-c # disconnection is ok
And tested "usb start" and could list a usb thumb drive.
Any other tests you would like me to do?
Neil
Mattijs Korpershoek (2): usb: dwc3-meson-g12a: force mode on child add/removal ARM: meson: g12a: switch dwc2 otg to DM
arch/arm/mach-meson/board-g12a.c | 127 ------------------------------ configs/bananapi-m5_defconfig | 1 + configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/khadas-vim3_android_ab_defconfig | 1 + configs/khadas-vim3_android_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_android_ab_defconfig | 1 + configs/khadas-vim3l_android_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/sei510_defconfig | 1 + configs/sei610_defconfig | 1 + configs/u200_defconfig | 1 + drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++ 19 files changed, 35 insertions(+), 127 deletions(-)
base-commit: 7b70f68977578360d9c47bb25d6d1937075153b4 change-id: 20221024-meson-dm-usb-60e413696519
Best regards,
Hi,
On 14/12/2022 15:45, Mattijs Korpershoek wrote:
Hi Neil,
<snip>
I'll run some tests on other G12 boards but so far this looks very good, thanks !
I got my hands on an odroid-c4 board and I also tested: => fastboot usb 0 => # hit Ctrl-c # disconnection is ok
And tested "usb start" and could list a usb thumb drive.
Any other tests you would like me to do?
No it's enough, thx for testing on the C4, this test the Device/Host switch is still working !
Marek, can you take the whole patchset with my Acked-by or should I take it ?
Neil
Neil
Mattijs Korpershoek (2): usb: dwc3-meson-g12a: force mode on child add/removal ARM: meson: g12a: switch dwc2 otg to DM
arch/arm/mach-meson/board-g12a.c | 127 ------------------------------ configs/bananapi-m5_defconfig | 1 + configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/khadas-vim3_android_ab_defconfig | 1 + configs/khadas-vim3_android_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_android_ab_defconfig | 1 + configs/khadas-vim3l_android_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/sei510_defconfig | 1 + configs/sei610_defconfig | 1 + configs/u200_defconfig | 1 + drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++ 19 files changed, 35 insertions(+), 127 deletions(-)
base-commit: 7b70f68977578360d9c47bb25d6d1937075153b4 change-id: 20221024-meson-dm-usb-60e413696519
Best regards,
On Wed, Dec 14, 2022 at 15:49, neil.armstrong@linaro.org wrote:
Hi,
On 14/12/2022 15:45, Mattijs Korpershoek wrote:
Hi Neil,
<snip>
I'll run some tests on other G12 boards but so far this looks very good, thanks !
I got my hands on an odroid-c4 board and I also tested: => fastboot usb 0 => # hit Ctrl-c # disconnection is ok
And tested "usb start" and could list a usb thumb drive.
Any other tests you would like me to do?
No it's enough, thx for testing on the C4, this test the Device/Host switch is still working !
Marek, can you take the whole patchset with my Acked-by or should I take it ?
Neil
Hi Neil, Marek,
Anything blocking to pick this up? I see it's assigned to Neil on patchwork, but it's mostly usb related.
I've just re-tested the series on top of usb/master, if that helps.
Thanks you, Mattijs
Neil
Mattijs Korpershoek (2): usb: dwc3-meson-g12a: force mode on child add/removal ARM: meson: g12a: switch dwc2 otg to DM
arch/arm/mach-meson/board-g12a.c | 127 ------------------------------ configs/bananapi-m5_defconfig | 1 + configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/khadas-vim3_android_ab_defconfig | 1 + configs/khadas-vim3_android_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_android_ab_defconfig | 1 + configs/khadas-vim3l_android_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/sei510_defconfig | 1 + configs/sei610_defconfig | 1 + configs/u200_defconfig | 1 + drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++ 19 files changed, 35 insertions(+), 127 deletions(-)
base-commit: 7b70f68977578360d9c47bb25d6d1937075153b4 change-id: 20221024-meson-dm-usb-60e413696519
Best regards,
On 10/01/2023 12:01, Mattijs Korpershoek wrote:
On Wed, Dec 14, 2022 at 15:49, neil.armstrong@linaro.org wrote:
Hi,
On 14/12/2022 15:45, Mattijs Korpershoek wrote:
Hi Neil,
<snip>
I'll run some tests on other G12 boards but so far this looks very good, thanks !
I got my hands on an odroid-c4 board and I also tested: => fastboot usb 0 => # hit Ctrl-c # disconnection is ok
And tested "usb start" and could list a usb thumb drive.
Any other tests you would like me to do?
No it's enough, thx for testing on the C4, this test the Device/Host switch is still working !
Marek, can you take the whole patchset with my Acked-by or should I take it ?
Neil
Hi Neil, Marek,
Anything blocking to pick this up? I see it's assigned to Neil on patchwork, but it's mostly usb related.
I've just re-tested the series on top of usb/master, if that helps.
Marek,
I'm ready to merge it, is it ok for you ?
Neil
Thanks you, Mattijs
Neil
Mattijs Korpershoek (2): usb: dwc3-meson-g12a: force mode on child add/removal ARM: meson: g12a: switch dwc2 otg to DM
arch/arm/mach-meson/board-g12a.c | 127 ------------------------------ configs/bananapi-m5_defconfig | 1 + configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/khadas-vim3_android_ab_defconfig | 1 + configs/khadas-vim3_android_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_android_ab_defconfig | 1 + configs/khadas-vim3l_android_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/sei510_defconfig | 1 + configs/sei610_defconfig | 1 + configs/u200_defconfig | 1 + drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++ 19 files changed, 35 insertions(+), 127 deletions(-)
base-commit: 7b70f68977578360d9c47bb25d6d1937075153b4 change-id: 20221024-meson-dm-usb-60e413696519
Best regards,
Hi,
On Wed, 23 Nov 2022 16:42:48 +0100, Mattijs Korpershoek wrote:
While working on some USB bugs on the VIM3L board, we stumbled upon the fact that mach-meson still uses legacy board_usb_*() functions instead of using DM [1]
This series aim to switch the g12a based boards to use CONFIG_DM_USB_GADGET and removes the board_usb_*() logic.
- The first patch adds mode switching in the dwc3-meson-g12a glue driver whenever the dwc2 otg driver is probed()/removed().
[...]
Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-amlogic (u-boot-amlogic-test)
[1/2] usb: dwc3-meson-g12a: force mode on child add/removal https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/fd083842d71... [2/2] ARM: meson: g12a: switch dwc2 otg to DM https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/b96640cbfb3...
participants (3)
-
Mattijs Korpershoek -
Neil Armstrong -
neil.armstrong＠linaro.org