Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-11 15:34:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: udc: dwc3: Fold board dm_usb_gadget_handle_interrupts() into DWC3 gadget

Browse source 
The dm_usb_gadget_handle_interrupts() has no place in board code. Move
this into DWC3 driver. The OMAP implementation is special, add new weak
dwc3_uboot_interrupt_status() function to decide whether DWC3 interrupt
handling should be called, and override it in OMAP DWC3 code, to repair
the special OMAP interrupt handling code until OMAP gets switched over
to DM UDC proper.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Caleb Connolly <caleb.connolly@linaro.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3
Tested-by: Caleb Connolly <caleb.connolly@linaro.org> # qcom sdm845
Link: https://lore.kernel.org/r/20240317044357.547037-1-marek.vasut+renesas@mailbox.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Marek Vasut 2024-03-17 05:42:52 +01:00 • committed by Mattijs Korpershoek
parent 42839c0fdf
commit 4d15898089
8 changed files with 24 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
board/purism/librem5/spl.c
View file

@ -418,12 +418,6 @@ out:
return rv;
}
int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{
dwc3_uboot_handle_interrupt(dev);
return 0;
}
static void dwc3_nxp_usb_phy_init(struct dwc3_device *dwc3)
{
u32 RegData;

6
board/samsung/common/exynos5-dt.c
View file

@ -122,12 +122,6 @@ static struct dwc3_device dwc3_device_data = {
.index = 0,
};
int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{
dwc3_uboot_handle_interrupt(dev);
return 0;
}
int board_usb_init(int index, enum usb_init_type init)
{
struct exynos_usb3_phy *phy = (struct exynos_usb3_phy *)

6
board/st/stih410-b2260/board.c
View file

@ -50,12 +50,6 @@ static struct dwc3_device dwc3_device_data = {
.index = 0,
};
int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{
dwc3_uboot_handle_interrupt(dev);
return 0;
}
int board_usb_init(int index, enum usb_init_type init)
{
int node;

11
board/ti/am43xx/board.c
View file

@ -759,17 +759,6 @@ static struct ti_usb_phy_device usb_phy2_device = {
.usb2_phy_power = (void *)USB2_PHY2_POWER,
.index = 1,
};
int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{
u32 status;
status = dwc3_omap_uboot_interrupt_status(dev);
if (status)
dwc3_uboot_handle_interrupt(dev);
return 0;
}
#endif /* CONFIG_USB_DWC3 */
#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP)

25
drivers/usb/dwc3/core.c
View file

@ -983,6 +983,11 @@ void dwc3_uboot_exit(int index)
}
}
MODULE_ALIAS("platform:dwc3");
MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver");
/**
* dwc3_uboot_handle_interrupt - handle dwc3 core interrupt
* @dev: device of this controller
@ -1004,10 +1009,22 @@ void dwc3_uboot_handle_interrupt(struct udevice *dev)
}
}
MODULE_ALIAS("platform:dwc3");
MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver");
#if !CONFIG_IS_ENABLED(DM_USB_GADGET)
__weak int dwc3_uboot_interrupt_status(struct udevice *dev)
{
return 1;
}
int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{
if (!dwc3_uboot_interrupt_status(dev))
return 0;
dwc3_uboot_handle_interrupt(dev);
return 0;
}
#endif
#if CONFIG_IS_ENABLED(PHY) && CONFIG_IS_ENABLED(DM_USB)
int dwc3_setup_phy(struct udevice *dev, struct phy_bulk *phys)

4
drivers/usb/dwc3/dwc3-omap.c
View file

@ -428,7 +428,7 @@ void dwc3_omap_uboot_exit(int index)
}
/**
* dwc3_omap_uboot_interrupt_status - check the status of interrupt
* dwc3_uboot_interrupt_status - check the status of interrupt
* @dev: device of this controller
*
* Checks the status of interrupts and returns true if an interrupt
@ -436,7 +436,7 @@ void dwc3_omap_uboot_exit(int index)
*
* Generally called from board file.
*/
int dwc3_omap_uboot_interrupt_status(struct udevice *dev)
int dwc3_uboot_interrupt_status(struct udevice *dev)
{
struct dwc3_omap *omap = NULL;

1
include/dwc3-omap-uboot.h
View file

@ -27,5 +27,4 @@ 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(struct udevice *dev);
#endif /* __DWC3_OMAP_UBOOT_H_ */

1
include/dwc3-uboot.h
View file

@ -44,6 +44,7 @@ struct dwc3_device {
int dwc3_uboot_init(struct dwc3_device *dev);
void dwc3_uboot_exit(int index);
int dwc3_uboot_interrupt_status(struct udevice *dev);
void dwc3_uboot_handle_interrupt(struct udevice *dev);
struct phy;