104 lines
3.0 KiB
Diff
104 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Marek Vasut <marex@denx.de>
|
|
Date: Fri, 1 Sep 2023 11:50:01 +0200
|
|
Subject: usb: gadget: ether: Use plain udevice for UDC controller interaction
|
|
|
|
Convert to plain udevice interaction with UDC controller
|
|
device, avoid the use of UDC uclass dev_array .
|
|
|
|
Signed-off-by: Marek Vasut <marex@denx.de>
|
|
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
|
|
---
|
|
drivers/usb/gadget/ether.c | 20 +++++-----
|
|
1 file changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/usb/gadget/ether.c
|
|
+++ b/drivers/usb/gadget/ether.c
|
|
@@ -1880,8 +1880,10 @@ static void eth_start(struct eth_dev *dev, gfp_t gfp_flags)
|
|
}
|
|
}
|
|
|
|
-static int eth_stop(struct eth_dev *dev)
|
|
+static int eth_stop(struct udevice *udev)
|
|
{
|
|
+ struct ether_priv *priv = dev_get_priv(udev);
|
|
+ struct eth_dev *dev = &priv->ethdev;
|
|
#ifdef RNDIS_COMPLETE_SIGNAL_DISCONNECT
|
|
unsigned long ts;
|
|
unsigned long timeout = CONFIG_SYS_HZ; /* 1 sec to stop RNDIS */
|
|
@@ -1895,7 +1897,7 @@ static int eth_stop(struct eth_dev *dev)
|
|
/* Wait until host receives OID_GEN_MEDIA_CONNECT_STATUS */
|
|
ts = get_timer(0);
|
|
while (get_timer(ts) < timeout)
|
|
- usb_gadget_handle_interrupts(0);
|
|
+ dm_usb_gadget_handle_interrupts(udev->parent);
|
|
#endif
|
|
|
|
rndis_uninit(dev->rndis_config);
|
|
@@ -2300,7 +2302,7 @@ static int usb_eth_start(struct udevice *udev)
|
|
pr_err("The remote end did not respond in time.");
|
|
goto fail;
|
|
}
|
|
- usb_gadget_handle_interrupts(0);
|
|
+ dm_usb_gadget_handle_interrupts(udev->parent);
|
|
}
|
|
|
|
packet_received = 0;
|
|
@@ -2370,7 +2372,7 @@ static int usb_eth_send(struct udevice *udev, void *packet, int length)
|
|
printf("timeout sending packets to usb ethernet\n");
|
|
return -1;
|
|
}
|
|
- usb_gadget_handle_interrupts(0);
|
|
+ dm_usb_gadget_handle_interrupts(udev->parent);
|
|
}
|
|
free(rndis_pkt);
|
|
|
|
@@ -2400,13 +2402,13 @@ static void usb_eth_stop(struct udevice *udev)
|
|
* 2) 'pullup' callback in your UDC driver can be improved to perform
|
|
* this deinitialization.
|
|
*/
|
|
- eth_stop(dev);
|
|
+ eth_stop(udev);
|
|
|
|
usb_gadget_disconnect(dev->gadget);
|
|
|
|
/* Clear pending interrupt */
|
|
if (dev->network_started) {
|
|
- usb_gadget_handle_interrupts(0);
|
|
+ dm_usb_gadget_handle_interrupts(udev->parent);
|
|
dev->network_started = 0;
|
|
}
|
|
}
|
|
@@ -2416,7 +2418,7 @@ static int usb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
|
|
struct ether_priv *priv = dev_get_priv(dev);
|
|
struct eth_dev *ethdev = &priv->ethdev;
|
|
|
|
- usb_gadget_handle_interrupts(0);
|
|
+ dm_usb_gadget_handle_interrupts(dev->parent);
|
|
|
|
if (packet_received) {
|
|
if (ethdev->rx_req) {
|
|
@@ -2467,7 +2469,7 @@ int usb_ether_init(void)
|
|
return ret;
|
|
}
|
|
|
|
- return usb_gadget_initialize(0);
|
|
+ return 0;
|
|
}
|
|
|
|
static int usb_eth_probe(struct udevice *dev)
|
|
@@ -2528,7 +2530,7 @@ static int usb_eth_remove(struct udevice *dev)
|
|
|
|
static int usb_eth_unbind(struct udevice *dev)
|
|
{
|
|
- usb_gadget_release(0);
|
|
+ udc_device_put(dev->parent);
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
Armbian
|
|
|