In case CONFIG_USB_MUSB_HOST is set, the ux500_gadget_ops get overridden
to musb_usb_ops . Simply set the ops one way or the other depending on
whether CONFIG_USB_MUSB_HOST is set or not.
Fixes: ac4bf5d48a9e ("usb: gadget: ux500: Convert interrupt handling to
usb_gadget_generic_ops")
Signed-off-by: Marek Vasut <marek.vasut+rene...@mailbox.org>
---
Cc: Linus Walleij <linus.wall...@linaro.org>
Cc: Mattijs Korpershoek <mkorpersh...@baylibre.com>
Cc: Stephan Gerhold <step...@gerhold.net>
Cc: Tom Rini <tr...@konsulko.com>
Cc: u-boot@lists.denx.de
---
drivers/usb/musb-new/ux500.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/musb-new/ux500.c b/drivers/usb/musb-new/ux500.c
index 89dd75b7d05..be0085f403d 100644
--- a/drivers/usb/musb-new/ux500.c
+++ b/drivers/usb/musb-new/ux500.c
@@ -169,16 +169,14 @@ U_BOOT_DRIVER(ux500_musb) = {
.name = "ux500-musb",
#ifdef CONFIG_USB_MUSB_HOST
.id = UCLASS_USB,
+ .ops = &musb_usb_ops,
#else
.id = UCLASS_USB_GADGET_GENERIC,
+ .ops = &ux500_gadget_ops,
#endif
.of_match = ux500_musb_ids,
- .ops = &ux500_gadget_ops,
.probe = ux500_musb_probe,
.remove = ux500_musb_remove,
-#ifdef CONFIG_USB_MUSB_HOST
- .ops = &musb_usb_ops,
-#endif
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ux500_glue),
};
--
2.43.0
