diff options
| author | Mattijs Korpershoek <mkorpershoek@baylibre.com> | 2022-11-23 16:42:49 +0100 |
|---|---|---|
| committer | Neil Armstrong <neil.armstrong@linaro.org> | 2023-01-17 09:27:17 +0100 |
| commit | fd083842d719cf13d64b0ec061d3c7be98be91a2 (patch) | |
| tree | dab413b83353eab0bf3594b32ddba18147c93e50 /drivers/usb | |
| parent | 8d9a0e6a05e31beab7e86c3ccef78f7279383a7f (diff) | |
| download | u-boot-fd083842d719cf13d64b0ec061d3c7be98be91a2.tar.gz u-boot-fd083842d719cf13d64b0ec061d3c7be98be91a2.tar.bz2 u-boot-fd083842d719cf13d64b0ec061d3c7be98be91a2.zip | |
usb: dwc3-meson-g12a: force mode on child add/removal
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>
Link: https://lore.kernel.org/r/20221024-meson-dm-usb-v1-1-2ab077a503b9@baylibre.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/dwc3/dwc3-meson-g12a.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c index 90418ddc1d..c62e42de73 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), }; |