Message ID | 20230819142407.49632-4-marex@denx.de |
---|---|
State | Superseded |
Delegated to: | Marek Vasut |
Headers | show |
Series | [01/17] dm: usb: udc: Factor out plain udevice handler functions | expand |
On sam., août 19, 2023 at 16:23, Marek Vasut <marex@denx.de> wrote: > 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> > --- > Cc: Angus Ainslie <angus@akkea.ca> > Cc: Dmitrii Merkurev <dimorinny@google.com> > Cc: Eddie Cai <eddie.cai.linux@gmail.com> > Cc: Kever Yang <kever.yang@rock-chips.com> > Cc: Lukasz Majewski <lukma@denx.de> > Cc: Miquel Raynal <miquel.raynal@bootlin.com> > Cc: Mattijs Korpershoek <mkorpershoek@baylibre.com> > Cc: Nishanth Menon <nm@ti.com> > Cc: Patrice Chotard <patrice.chotard@foss.st.com> > Cc: Patrick Delaunay <patrick.delaunay@foss.st.com> > Cc: Philipp Tomsich <philipp.tomsich@vrull.eu> > Cc: Simon Glass <sjg@chromium.org> > Cc: Stefan Roese <sr@denx.de> > Cc: kernel@puri.sm > --- > cmd/fastboot.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Tested that I could reflash the bootloader (raw) partition with: $ fastboot flash bootloader u-boot_kvim3_noab.bin Works fine! Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # on khadas vim3 Based on: 2023.10-rc3 > > diff --git a/cmd/fastboot.c b/cmd/fastboot.c > index 3d5ff951eb6..17fb0a0aa7b 100644 > --- a/cmd/fastboot.c > +++ b/cmd/fastboot.c > @@ -61,6 +61,7 @@ static int do_fastboot_usb(int argc, char *const argv[], > { > int controller_index; > char *usb_controller; > + struct udevice *udc; > char *endp; > int ret; > > @@ -79,7 +80,7 @@ static int do_fastboot_usb(int argc, char *const argv[], > return CMD_RET_FAILURE; > } > > - ret = usb_gadget_initialize(controller_index); > + ret = udc_device_get_by_index(controller_index, &udc); > if (ret) { > pr_err("USB init failed: %d\n", ret); > return CMD_RET_FAILURE; > @@ -103,13 +104,13 @@ static int do_fastboot_usb(int argc, char *const argv[], > if (ctrlc()) > break; > schedule(); > - usb_gadget_handle_interrupts(controller_index); > + dm_usb_gadget_handle_interrupts(udc); > } > > ret = CMD_RET_SUCCESS; > > exit: > - usb_gadget_release(controller_index); > + udc_device_put(udc); > g_dnl_unregister(); > g_dnl_clear_detach(); > > -- > 2.40.1
diff --git a/cmd/fastboot.c b/cmd/fastboot.c index 3d5ff951eb6..17fb0a0aa7b 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -61,6 +61,7 @@ static int do_fastboot_usb(int argc, char *const argv[], { int controller_index; char *usb_controller; + struct udevice *udc; char *endp; int ret; @@ -79,7 +80,7 @@ static int do_fastboot_usb(int argc, char *const argv[], return CMD_RET_FAILURE; } - ret = usb_gadget_initialize(controller_index); + ret = udc_device_get_by_index(controller_index, &udc); if (ret) { pr_err("USB init failed: %d\n", ret); return CMD_RET_FAILURE; @@ -103,13 +104,13 @@ static int do_fastboot_usb(int argc, char *const argv[], if (ctrlc()) break; schedule(); - usb_gadget_handle_interrupts(controller_index); + dm_usb_gadget_handle_interrupts(udc); } ret = CMD_RET_SUCCESS; exit: - usb_gadget_release(controller_index); + udc_device_put(udc); g_dnl_unregister(); g_dnl_clear_detach();
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> --- Cc: Angus Ainslie <angus@akkea.ca> Cc: Dmitrii Merkurev <dimorinny@google.com> Cc: Eddie Cai <eddie.cai.linux@gmail.com> Cc: Kever Yang <kever.yang@rock-chips.com> Cc: Lukasz Majewski <lukma@denx.de> Cc: Miquel Raynal <miquel.raynal@bootlin.com> Cc: Mattijs Korpershoek <mkorpershoek@baylibre.com> Cc: Nishanth Menon <nm@ti.com> Cc: Patrice Chotard <patrice.chotard@foss.st.com> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com> Cc: Philipp Tomsich <philipp.tomsich@vrull.eu> Cc: Simon Glass <sjg@chromium.org> Cc: Stefan Roese <sr@denx.de> Cc: kernel@puri.sm --- cmd/fastboot.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)