usb: gadget: dwc3: Convert interrupt handling to usb_gadget_generic_ops

Implement .handle_interrupts callback as a replacement for deprecated
dm_usb_gadget_handle_interrupts() function. The new callback allows
for each DM capable USB gadget controller driver to define its own
IRQ handling implementation without colliding with other controller
drivers.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Alexander Sverdlin <alexander.sverdlin@siemens.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3
Link: https://lore.kernel.org/r/20240614005309.34433-5-marek.vasut+renesas@mailbox.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index 8db678eb85d45da5ec7020312eaa6c06d1e24e7d..731ede2fead60a3ad0fd2331e0f5fffb02f2568d 100644 (file)
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -194,34 +194,39 @@ static int dwc3_generic_of_to_plat(struct udevice *dev)
 }
 
 #if CONFIG_IS_ENABLED(DM_USB_GADGET)
-int dm_usb_gadget_handle_interrupts(struct udevice *dev)
+static int dwc3_generic_peripheral_probe(struct udevice *dev)
 {
        struct dwc3_generic_priv *priv = dev_get_priv(dev);
-       struct dwc3 *dwc3 = &priv->dwc3;
 
-       dwc3_gadget_uboot_handle_interrupt(dwc3);
-
-       return 0;
+       return dwc3_generic_probe(dev, priv);
 }
 
-static int dwc3_generic_peripheral_probe(struct udevice *dev)
+static int dwc3_generic_peripheral_remove(struct udevice *dev)
 {
        struct dwc3_generic_priv *priv = dev_get_priv(dev);
 
-       return dwc3_generic_probe(dev, priv);
+       return dwc3_generic_remove(dev, priv);
 }
 
-static int dwc3_generic_peripheral_remove(struct udevice *dev)
+static int dwc3_gadget_handle_interrupts(struct udevice *dev)
 {
        struct dwc3_generic_priv *priv = dev_get_priv(dev);
+       struct dwc3 *dwc3 = &priv->dwc3;
 
-       return dwc3_generic_remove(dev, priv);
+       dwc3_gadget_uboot_handle_interrupt(dwc3);
+
+       return 0;
 }
 
+static const struct usb_gadget_generic_ops dwc3_gadget_ops = {
+       .handle_interrupts      = dwc3_gadget_handle_interrupts,
+};
+
 U_BOOT_DRIVER(dwc3_generic_peripheral) = {
        .name   = "dwc3-generic-peripheral",
        .id     = UCLASS_USB_GADGET_GENERIC,
        .of_to_plat = dwc3_generic_of_to_plat,
+       .ops    = &dwc3_gadget_ops,
        .probe = dwc3_generic_peripheral_probe,
        .remove = dwc3_generic_peripheral_remove,
        .priv_auto      = sizeof(struct dwc3_generic_priv),

diff --git a/drivers/usb/dwc3/dwc3-layerscape.c b/drivers/usb/dwc3/dwc3-layerscape.c
index ff83bf71e89857dec27eee2847277eb0ce2a2f7d..108b44c67eb0e5d81f2c37d2340c4f370365e6a5 100644 (file)
--- a/drivers/usb/dwc3/dwc3-layerscape.c
+++ b/drivers/usb/dwc3/dwc3-layerscape.c
@@ -99,33 +99,38 @@ static int dwc3_layerscape_of_to_plat(struct udevice *dev)
 }
 
 #if CONFIG_IS_ENABLED(DM_USB_GADGET)
-int dm_usb_gadget_handle_interrupts(struct udevice *dev)
+static int dwc3_layerscape_peripheral_probe(struct udevice *dev)
 {
        struct dwc3_layerscape_priv *priv = dev_get_priv(dev);
 
-       dwc3_gadget_uboot_handle_interrupt(&priv->dwc3);
-
-       return 0;
+       return dwc3_layerscape_probe(dev, priv);
 }
 
-static int dwc3_layerscape_peripheral_probe(struct udevice *dev)
+static int dwc3_layerscape_peripheral_remove(struct udevice *dev)
 {
        struct dwc3_layerscape_priv *priv = dev_get_priv(dev);
 
-       return dwc3_layerscape_probe(dev, priv);
+       return dwc3_layerscape_remove(dev, priv);
 }
 
-static int dwc3_layerscape_peripheral_remove(struct udevice *dev)
+static int dwc3_layerscape_gadget_handle_interrupts(struct udevice *dev)
 {
        struct dwc3_layerscape_priv *priv = dev_get_priv(dev);
 
-       return dwc3_layerscape_remove(dev, priv);
+       dwc3_gadget_uboot_handle_interrupt(&priv->dwc3);
+
+       return 0;
 }
 
+static const struct usb_gadget_generic_ops dwc3_layerscape_gadget_ops = {
+       .handle_interrupts      = dwc3_layerscape_gadget_handle_interrupts,
+};
+
 U_BOOT_DRIVER(dwc3_layerscape_peripheral) = {
        .name   = "dwc3-layerscape-peripheral",
        .id     = UCLASS_USB_GADGET_GENERIC,
        .of_to_plat = dwc3_layerscape_of_to_plat,
+       .ops    = &dwc3_layerscape_gadget_ops,
        .probe = dwc3_layerscape_peripheral_probe,
        .remove = dwc3_layerscape_peripheral_remove,
        .priv_auto      = sizeof(struct dwc3_layerscape_priv),