From e6b034384c51311d588c2d772bdeeea2363a57a9 Mon Sep 17 00:00:00 2001 From: Thorsten Maerz Date: Thu, 6 Mar 2025 18:41:42 +0100 Subject: [PATCH] mksklipad50: uboot2025: fix usb dwc2-otg/dwc3-host compile RK3328 board with dwc2-otg and dwc3-host run into "multiple definition of 'dm_usb_gadget_handle_interrupts'" See https://lore.kernel.org/u-boot/7805b8d0-fb7c-41d5-8d74-f85dfd40233a@kwiboo.se/ --- .../03-rk3328-mksklipad50-uboot-dwc3.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 patch/u-boot/v2025.01/board_mksklipad50/03-rk3328-mksklipad50-uboot-dwc3.patch diff --git a/patch/u-boot/v2025.01/board_mksklipad50/03-rk3328-mksklipad50-uboot-dwc3.patch b/patch/u-boot/v2025.01/board_mksklipad50/03-rk3328-mksklipad50-uboot-dwc3.patch new file mode 100644 index 0000000000..d58d38c0ce --- /dev/null +++ b/patch/u-boot/v2025.01/board_mksklipad50/03-rk3328-mksklipad50-uboot-dwc3.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thorsten Maerz +Date: Thu, 06 Mar 2025 11:09:00 +0100 +Subject: Fix multiple dwc2/dwc3 definitions + +Fixes "multiple definition of 'dm_usb_gadget_handle_interrupts'" +See https://lore.kernel.org/u-boot/7805b8d0-fb7c-41d5-8d74-f85dfd40233a@kwiboo.se/ +--- + +diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c +index 2ab41cbae4..ccc1803fb3 100644 +--- a/drivers/usb/dwc3/dwc3-generic.c ++++ b/drivers/usb/dwc3/dwc3-generic.c +@@ -192,7 +192,7 @@ static int dwc3_generic_of_to_plat(struct udevice *dev) + return 0; + } + +-#if CONFIG_IS_ENABLED(DM_USB_GADGET) ++#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) && CONFIG_IS_ENABLED(DM_USB_GADGET) + static int dwc3_generic_peripheral_probe(struct udevice *dev) + { + struct dwc3_generic_priv *priv = dev_get_priv(dev); + + +diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c +index a35b8c2f64..9bd06afe0a 100644 +--- a/drivers/usb/dwc3/core.c ++++ b/drivers/usb/dwc3/core.c +@@ -988,7 +988,7 @@ MODULE_AUTHOR("Felipe Balbi "); + MODULE_LICENSE("GPL v2"); + MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver"); + +-#if !CONFIG_IS_ENABLED(DM_USB_GADGET) ++#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) && !CONFIG_IS_ENABLED(DM_USB_GADGET) + __weak int dwc3_uboot_interrupt_status(struct udevice *dev) + { + return 1;