From b07a26d71ec8c3f0489afb8d4437bbb1d61a6d78 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-fdr@jannau.net>
Date: Apr 19 2024 16:58:34 +0000
Subject: Fix dwc2 f40 / rawhide build with asahi patches


---

diff --git a/asahi-d62ffcafa137b41385abe9d6272b4373e46a8602.patch b/asahi-d62ffcafa137b41385abe9d6272b4373e46a8602.patch
new file mode 100644
index 0000000..1b3feae
--- /dev/null
+++ b/asahi-d62ffcafa137b41385abe9d6272b4373e46a8602.patch
@@ -0,0 +1,75 @@
+commit d62ffcafa137b41385abe9d6272b4373e46a8602
+Author: Janne Grunau <j@jannau.net>
+Date:   Fri Apr 19 18:54:08 2024 +0200
+
+    fixup! usb: Pass through timeout to drivers
+
+diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
+index 637eb2dd06..dbf7c53a8d 100644
+--- a/drivers/usb/host/dwc2.c
++++ b/drivers/usb/host/dwc2.c
+@@ -1281,7 +1281,7 @@ int usb_lowlevel_stop(int index)
+ #if CONFIG_IS_ENABLED(DM_USB)
+ static int dwc2_submit_control_msg(struct udevice *dev, struct usb_device *udev,
+ 				   unsigned long pipe, void *buffer, int length,
+-				   struct devrequest *setup)
++				   struct devrequest *setup, int timeout)
+ {
+ 	struct dwc2_priv *priv = dev_get_priv(dev);
+ 
+@@ -1292,7 +1292,8 @@ static int dwc2_submit_control_msg(struct udevice *dev, struct usb_device *udev,
+ }
+ 
+ static int dwc2_submit_bulk_msg(struct udevice *dev, struct usb_device *udev,
+-				unsigned long pipe, void *buffer, int length)
++				unsigned long pipe, void *buffer, int length,
++				int timeout)
+ {
+ 	struct dwc2_priv *priv = dev_get_priv(dev);
+ 
+diff --git a/drivers/usb/isp1760/isp1760-uboot.c b/drivers/usb/isp1760/isp1760-uboot.c
+index 203500a4cb..a64b28dfd0 100644
+--- a/drivers/usb/isp1760/isp1760-uboot.c
++++ b/drivers/usb/isp1760/isp1760-uboot.c
+@@ -28,7 +28,8 @@
+ static int isp1760_msg_submit_control(struct udevice *dev,
+ 				      struct usb_device *udev,
+ 				      unsigned long pipe, void *buffer,
+-				      int length, struct devrequest *setup)
++				      int length, struct devrequest *setup,
++				      int timeout)
+ {
+ 	struct isp1760_host_data *host = dev_get_priv(dev);
+ 
+@@ -38,7 +39,8 @@ static int isp1760_msg_submit_control(struct udevice *dev,
+ }
+ 
+ static int isp1760_msg_submit_bulk(struct udevice *dev, struct usb_device *udev,
+-				   unsigned long pipe, void *buffer, int length)
++				   unsigned long pipe, void *buffer, int length,
++				   int timeout)
+ {
+ 	struct isp1760_host_data *host = dev_get_priv(dev);
+ 
+diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
+index 7cea9a2ed6..72b3d431c5 100644
+--- a/drivers/usb/musb-new/musb_uboot.c
++++ b/drivers/usb/musb-new/musb_uboot.c
+@@ -310,14 +310,15 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
+ #if CONFIG_IS_ENABLED(DM_USB)
+ static int musb_submit_control_msg(struct udevice *dev, struct usb_device *udev,
+ 				   unsigned long pipe, void *buffer, int length,
+-				   struct devrequest *setup)
++				   struct devrequest *setup, int timeout)
+ {
+ 	struct musb_host_data *host = dev_get_priv(dev);
+ 	return _musb_submit_control_msg(host, udev, pipe, buffer, length, setup);
+ }
+ 
+ static int musb_submit_bulk_msg(struct udevice *dev, struct usb_device *udev,
+-				unsigned long pipe, void *buffer, int length)
++				unsigned long pipe, void *buffer, int length,
++				int timeout)
+ {
+ 	struct musb_host_data *host = dev_get_priv(dev);
+ 	return _musb_submit_bulk_msg(host, udev, pipe, buffer, length);
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 967b3f4..d950cc1 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -7,7 +7,7 @@
 
 Name:     uboot-tools
 Version:  2024.04
-Release:  2%{?candidate:.%{candidate}}%{?dist}
+Release:  3%{?candidate:.%{candidate}}%{?dist}
 Epoch:    1
 Summary:  U-Boot utilities
 License:  GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
@@ -129,6 +129,9 @@ Patch142: https://github.com/AsahiLinux/u-boot/commit/9c5932734b13f3d2fc13ae3120
 Patch143: https://github.com/AsahiLinux/u-boot/commit/31c0e5e8576f726d97772b94926680293ebb5302.patch#/asahi-31c0e5e8576f726d97772b94926680293ebb5302.patch
 # video: simplefb: HACK: Set video font size
 Patch144: https://github.com/AsahiLinux/u-boot/commit/ed7183f6d53b2df46752196ec3ff2d5bfe35d5b6.patch#/asahi-ed7183f6d53b2df46752196ec3ff2d5bfe35d5b6.patch
+# fixup! usb: Pass through timeout to drivers
+Patch145: https://github.com/AsahiLinux/u-boot/commit/d62ffcafa137b41385abe9d6272b4373e46a8602.patch#/asahi-d62ffcafa137b41385abe9d6272b4373e46a8602.patch
+
 
 BuildRequires:  bc
 BuildRequires:  bison
@@ -284,6 +287,9 @@ install -p -m 0755 builds/tools/env/fw_printenv %{buildroot}%{_bindir}
 %endif
 
 %changelog
+* Fri Apr 19 2024 Janne Grunau <janne-fdr@jannau.net> - 1:2024.04-3
+- fix dwc2 build
+
 * Thu Apr 18 2024 Janne Grunau <janne-fdr@jannau.net> - 1:2024.04-2
 - Import Asahi Linux patches for Apple Silicon support