Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: cdns3: Convert interrupt handling to usb_gadget_generic_ops

Browse Source 
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.

Keep the dm_usb_gadget_handle_interrupts() in this driver for non-DM
case for now, until this driver gets fully converted to DM USB gadget.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3
Link: https://lore.kernel.org/r/20240614005309.34433-3-marek.vasut+renesas@mailbox.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Marek Vasut
2024-06-14 02:51:17 +02:00
committed by Mattijs Korpershoek
parent d36ef5cbed
commit 356542d6dd
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/cdns3/core.c
View File

@@ -20,6 +20,7 @@
#include <linux/bug.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/usb/gadget.h>
#include <usb.h>
#include <usb/xhci.h>
@@ -462,15 +463,38 @@ static int cdns3_gadget_remove(struct udevice *dev)
return cdns3_remove(cdns);
}
static int cdns3_gadget_handle_interrupts(struct udevice *dev)
{
struct cdns3 *cdns = dev_get_priv(dev);
cdns3_gadget_uboot_handle_interrupt(cdns);
return 0;
}
static const struct usb_gadget_generic_ops cdns3_gadget_ops = {
.handle_interrupts = cdns3_gadget_handle_interrupts,
};
U_BOOT_DRIVER(cdns_usb3_peripheral) = {
.name = "cdns-usb3-peripheral",
.id = UCLASS_USB_GADGET_GENERIC,
.of_match = cdns3_ids,
.ops = &cdns3_gadget_ops,
.probe = cdns3_gadget_probe,
.remove = cdns3_gadget_remove,
.priv_auto = sizeof(struct cdns3_gadget_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#else
int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{
struct cdns3 *cdns = dev_get_priv(dev);
cdns3_gadget_uboot_handle_interrupt(cdns);
return 0;
}
#endif
#if defined(CONFIG_SPL_USB_HOST) || \

2
drivers/usb/cdns3/gadget-export.h
View File

@@ -25,4 +25,6 @@ static inline void cdns3_gadget_exit(struct cdns3 *cdns) { }
#endif
void cdns3_gadget_uboot_handle_interrupt(struct cdns3 *cdns);
#endif /* __LINUX_CDNS3_GADGET_EXPORT */

11
drivers/usb/cdns3/gadget.c
View File

@@ -2755,19 +2755,10 @@ int cdns3_gadget_init(struct cdns3 *cdns)
*
* Handles ep0 and gadget interrupt
*/
static void cdns3_gadget_uboot_handle_interrupt(struct cdns3 *cdns)
void cdns3_gadget_uboot_handle_interrupt(struct cdns3 *cdns)
{
int ret = cdns3_device_irq_handler(0, cdns);
if (ret == IRQ_WAKE_THREAD)
cdns3_device_thread_irq_handler(0, cdns);
}
int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{
struct cdns3 *cdns = dev_get_priv(dev);
cdns3_gadget_uboot_handle_interrupt(cdns);
return 0;
}