board: usb: Replace legacy usb_gadget_handle_interrupts()

The usb_gadget_handle_interrupts() is no longer used anywhere,
replace the remaining uses with dm_usb_gadget_handle_interrupts()
which takes udevice as a parameter.

Some of the UDC drivers currently ignore the index parameter altogether,
those also ignore the udevice and have to be reworked. Other like the
dwc3_uboot_handle_interrupt() had to be switched from index to udevice
look up to avoid breakage.

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # on khadas vim3
Signed-off-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 8d7b39ba157d6e83ad1e5f3af295786132684af2..57f08e0be0e98ad8fc40e3fadcec68b95c9f0e43 100644 (file)
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -299,9 +299,9 @@ static struct dwc3_device dwc3_device_data = {
        .hsphy_mode = USBPHY_INTERFACE_MODE_UTMIW,
 };
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
-       dwc3_uboot_handle_interrupt(0);
+       dwc3_uboot_handle_interrupt(dev);
        return 0;
 }
 

diff --git a/board/purism/librem5/spl.c b/board/purism/librem5/spl.c
index 90f1fcf415f38b1e0ad97edad1ca48072d88eef8..581f09296627b816871965521f7f0fef67e5785f 100644 (file)
--- a/board/purism/librem5/spl.c
+++ b/board/purism/librem5/spl.c
@@ -418,9 +418,9 @@ out:
        return rv;
 }
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
-       dwc3_uboot_handle_interrupt(0);
+       dwc3_uboot_handle_interrupt(dev);
        return 0;
 }
 

diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index cde77d79a0f6c9d81f88f0580d20a2c6760d4336..726b7f0667a6a76406173e3e1d89c67e26e4734a 100644 (file)
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -126,9 +126,9 @@ static struct dwc3_device dwc3_device_data = {
        .index = 0,
 };
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
-       dwc3_uboot_handle_interrupt(0);
+       dwc3_uboot_handle_interrupt(dev);
        return 0;
 }
 

diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c
index cd3a7dc51a2f2f03bf2484e179e236b7c71b9741..e21cbc270e99c298deacd05431a1eb679a4a3509 100644 (file)
--- a/board/st/stih410-b2260/board.c
+++ b/board/st/stih410-b2260/board.c
@@ -50,9 +50,9 @@ static struct dwc3_device dwc3_device_data = {
        .index = 0,
 };
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
-       dwc3_uboot_handle_interrupt(index);
+       dwc3_uboot_handle_interrupt(dev);
        return 0;
 }
 

diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 87e552a4701e5b1e08a2aacc4c5b6244a9d3ba2c..58bfe7cd455f5a4364e5f628f1dc39c0ecdc7b20 100644 (file)
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -760,13 +760,13 @@ static struct ti_usb_phy_device usb_phy2_device = {
        .index = 1,
 };
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
        u32 status;
 
-       status = dwc3_omap_uboot_interrupt_status(index);
+       status = dwc3_omap_uboot_interrupt_status(dev);
        if (status)
-               dwc3_uboot_handle_interrupt(index);
+               dwc3_uboot_handle_interrupt(dev);
 
        return 0;
 }

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 49f6a1900b014d9d8476d04fa1b4ccfc53e30057..7ca9d09824e67296488180437d0fd8cb4f5853cc 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -986,18 +986,18 @@ void dwc3_uboot_exit(int index)
 
 /**
  * dwc3_uboot_handle_interrupt - handle dwc3 core interrupt
- * @index: index of this controller
+ * @dev: device of this controller
  *
  * Invokes dwc3 gadget interrupts.
  *
  * Generally called from board file.
  */
-void dwc3_uboot_handle_interrupt(int index)
+void dwc3_uboot_handle_interrupt(struct udevice *dev)
 {
        struct dwc3 *dwc = NULL;
 
        list_for_each_entry(dwc, &dwc3_list, list) {
-               if (dwc->index != index)
+               if (dwc->dev != dev)
                        continue;
 
                dwc3_gadget_uboot_handle_interrupt(dwc);

diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 9596bf144c370a5bcfa4fff0e5c03a3f58671715..ff4ebfb4447f9452b5e71d75b2ad5e068b440570 100644 (file)
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -119,7 +119,7 @@
 #define USBOTGSS_UTMI_OTG_STATUS_VBUSVALID     (1 << 1)
 
 struct dwc3_omap {
-       struct device           *dev;
+       struct udevice          *dev;
 
        void __iomem            *base;
 
@@ -429,19 +429,19 @@ void dwc3_omap_uboot_exit(int index)
 
 /**
  * dwc3_omap_uboot_interrupt_status - check the status of interrupt
- * @index: index of this controller
+ * @dev: device of this controller
  *
  * Checks the status of interrupts and returns true if an interrupt
  * is detected or false otherwise.
  *
  * Generally called from board file.
  */
-int dwc3_omap_uboot_interrupt_status(int index)
+int dwc3_omap_uboot_interrupt_status(struct udevice *dev)
 {
        struct dwc3_omap *omap = NULL;
 
        list_for_each_entry(omap, &dwc3_omap_list, list)
-               if (omap->index == index)
+               if (omap->dev == dev)
                        return dwc3_omap_interrupt(-1, omap);
 
        return 0;

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 1feed417d68ec069d4f988daf2a6d53c4657c34e..c9dbec937b2a602cadfa76612272854c76d9244a 100644 (file)
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1429,7 +1429,7 @@ static const struct at91_udc_caps at91sam9261_udc_caps = {
 };
 #endif
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
        struct at91_udc *udc = controller;
 

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 7d51821497b46987ad4dca3b53705d81b68b4229..3bd7b3c075ab2b952bb0b61845fe30293c8fd0b0 100644 (file)
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -1198,14 +1198,13 @@ static struct usba_udc controller = {
        },
 };
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
        struct usba_udc *udc = &controller;
 
        return usba_udc_irq(udc);
 }
 
-
 int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 {
        struct usba_udc *udc = &controller;

diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index b9258d735757875b8c39d667e2c2a21bfbea5c8a..2bfacfe59f9d2168565f164ea9daff54b7bc2edb 100644 (file)
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -869,10 +869,10 @@ void udc_irq(void)
        }
 }
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
-       u32 value;
        struct ci_udc *udc = (struct ci_udc *)controller.ctrl->hcor;
+       u32 value;
 
        value = readl(&udc->usbsts);
        if (value)

diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 2bf7ed8d60468f0c179eef8ba61e0046a7269e85..589db8c972bc06aafc5ff38446d836f446726801 100644 (file)
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -941,15 +941,12 @@ int dwc2_udc_handle_interrupt(void)
        return 0;
 }
 
-#if !CONFIG_IS_ENABLED(DM_USB_GADGET)
-
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
        return dwc2_udc_handle_interrupt();
 }
 
-#else /* CONFIG_IS_ENABLED(DM_USB_GADGET) */
-
+#if CONFIG_IS_ENABLED(DM_USB_GADGET)
 struct dwc2_priv_data {
        struct clk_bulk         clks;
        struct reset_ctl_bulk   resets;
@@ -957,11 +954,6 @@ struct dwc2_priv_data {
        struct udevice *usb33d_supply;
 };
 
-int dm_usb_gadget_handle_interrupts(struct udevice *dev)
-{
-       return dwc2_udc_handle_interrupt();
-}
-
 static int dwc2_phy_setup(struct udevice *dev, struct phy_bulk *phys)
 {
        int ret;

diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c
index 7f54a3b00cb436113e83df8934d687a082a3f77c..9dfae08313b7bb5f00662eb0df34d694597a78f0 100644 (file)
--- a/drivers/usb/gadget/udc/udc-uclass.c
+++ b/drivers/usb/gadget/udc/udc-uclass.c
@@ -41,18 +41,6 @@ int udc_device_put(struct udevice *udev)
        return -ENOSYS;
 #endif
 }
-
-int usb_gadget_handle_interrupts(int index)
-{
-       struct udevice *udc;
-       int ret;
-
-       ret = udc_device_get_by_index(index, &udc);
-       if (ret)
-               return ret;
-
-       return dm_usb_gadget_handle_interrupts(udc);
-}
 #else
 /* Backwards hardware compatibility -- switch to DM_USB_GADGET */
 static int legacy_index;

diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c
index 582f72d00c156152b13d9219687232934dbbaa81..3d4f8d653b5d214041dc531537250d9b4372fcc9 100644 (file)
--- a/drivers/usb/host/usb-sandbox.c
+++ b/drivers/usb/host/usb-sandbox.c
@@ -130,11 +130,6 @@ int dm_usb_gadget_handle_interrupts(struct udevice *dev)
        return 0;
 }
 #else
-int usb_gadget_handle_interrupts(int index)
-{
-       return 0;
-}
-
 int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 {
        struct sandbox_udc *dev = this_controller;

diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 62c5e8e5fa4c6a237233c5535a2862bdef409bed..7cea9a2ed65c1594fb53bd8c309736ea092c4424 100644 (file)
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -376,7 +376,7 @@ struct dm_usb_ops musb_usb_ops = {
 #if defined(CONFIG_USB_MUSB_GADGET) && !CONFIG_IS_ENABLED(DM_USB_GADGET)
 static struct musb *gadget;
 
-int usb_gadget_handle_interrupts(int index)
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
 {
        schedule();
        if (!gadget || !gadget->isr)

diff --git a/include/dwc3-omap-uboot.h b/include/dwc3-omap-uboot.h
index 7c982e3798b04a68220cdbcd25356ae7990405d0..9e0e717dc985b65aaacb86277f2e7ef4339ab4a1 100644 (file)
--- a/include/dwc3-omap-uboot.h
+++ b/include/dwc3-omap-uboot.h
@@ -27,5 +27,5 @@ struct dwc3_omap_device {
 
 int dwc3_omap_uboot_init(struct dwc3_omap_device *dev);
 void dwc3_omap_uboot_exit(int index);
-int dwc3_omap_uboot_interrupt_status(int index);
+int dwc3_omap_uboot_interrupt_status(struct udevice *dev);
 #endif /* __DWC3_OMAP_UBOOT_H_ */

diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h
index e08530ec4e5894365afefb25599683801b00084c..bb0436c09737a4afef3c5cbfbb20c1c40071e489 100644 (file)
--- a/include/dwc3-uboot.h
+++ b/include/dwc3-uboot.h
@@ -44,7 +44,7 @@ struct dwc3_device {
 
 int dwc3_uboot_init(struct dwc3_device *dev);
 void dwc3_uboot_exit(int index);
-void dwc3_uboot_handle_interrupt(int index);
+void dwc3_uboot_handle_interrupt(struct udevice *dev);
 
 struct phy;
 #if CONFIG_IS_ENABLED(PHY) && CONFIG_IS_ENABLED(DM_USB)

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 699c32bf27917b56e43bda60e24970d2e722db04..36572be89e6c9fdcc370e902e37035c429fbaf29 100644 (file)
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -968,7 +968,7 @@ extern struct usb_ep *usb_ep_autoconfig(struct usb_gadget *,
 
 extern void usb_ep_autoconfig_reset(struct usb_gadget *);
 
-extern int usb_gadget_handle_interrupts(int index);
+extern int dm_usb_gadget_handle_interrupts(struct udevice *);
 
 /**
  * udc_device_get_by_index() - Get UDC udevice by index