Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 14:56:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sdp: Use plain udevice for UDC controller interaction

Browse source 
Convert to plain udevice interaction with UDC controller
device, avoid the use of UDC uclass dev_array .

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut 2023-09-01 11:49:58 +02:00
parent 99924db71f
commit 6b84acc978
4 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/usb_gadget_sdp.c
View file

@ -15,13 +15,16 @@
static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{ {
int controller_index; int controller_index;
struct udevice *udc;
int ret; int ret;
if (argc < 2) if (argc < 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;
controller_index = simple_strtoul(argv[1], NULL, 0); controller_index = simple_strtoul(argv[1], NULL, 0);
usb_gadget_initialize(controller_index); ret = udc_device_get_by_index(controller_index, &udc);
if (ret)
return ret;
g_dnl_clear_detach(); g_dnl_clear_detach();
ret = g_dnl_register("usb_dnl_sdp"); ret = g_dnl_register("usb_dnl_sdp");
@ -30,20 +33,20 @@ static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
goto exit_register; goto exit_register;
} }
ret = sdp_init(controller_index); ret = sdp_init(udc);
if (ret) { if (ret) {
pr_err("SDP init failed: %d\n", ret); pr_err("SDP init failed: %d\n", ret);
goto exit; goto exit;
} }
/* This command typically does not return but jumps to an image */ /* This command typically does not return but jumps to an image */
sdp_handle(controller_index); sdp_handle(udc);
pr_err("SDP ended\n"); pr_err("SDP ended\n");
exit: exit:
g_dnl_unregister(); g_dnl_unregister();
exit_register: exit_register:
usb_gadget_release(controller_index); udc_device_put(udc);
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }

13
common/spl/spl_sdp.c
View file

@ -14,10 +14,13 @@
static int spl_sdp_load_image(struct spl_image_info *spl_image, static int spl_sdp_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {
int ret;
const int controller_index = CONFIG_SPL_SDP_USB_DEV; const int controller_index = CONFIG_SPL_SDP_USB_DEV;
struct udevice *udc;
int ret;
usb_gadget_initialize(controller_index); ret = udc_device_get_by_index(controller_index, &udc);
if (ret)
return ret;
board_usb_init(controller_index, USB_INIT_DEVICE); board_usb_init(controller_index, USB_INIT_DEVICE);
@ -28,7 +31,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
goto err_detach; goto err_detach;
} }
ret = sdp_init(controller_index); ret = sdp_init(udc);
if (ret) { if (ret) {
pr_err("SDP init failed: %d\n", ret); pr_err("SDP init failed: %d\n", ret);
goto err_unregister; goto err_unregister;
@ -39,13 +42,13 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
* or it loads a FIT image and returns it to be handled by the SPL * or it loads a FIT image and returns it to be handled by the SPL
* code. * code.
*/ */
ret = spl_sdp_handle(controller_index, spl_image, bootdev); ret = spl_sdp_handle(udc, spl_image, bootdev);
debug("SDP ended\n"); debug("SDP ended\n");
err_unregister: err_unregister:
g_dnl_unregister(); g_dnl_unregister();
err_detach: err_detach:
usb_gadget_release(controller_index); udc_device_put(udc);
return ret; return ret;
} }
SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_BOARD, spl_sdp_load_image); SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_BOARD, spl_sdp_load_image);

10
drivers/usb/gadget/f_sdp.c
View file

@ -702,7 +702,7 @@ static int sdp_bind_config(struct usb_configuration *c)
return status; return status;
} }
int sdp_init(int controller_index) int sdp_init(struct udevice *udc)
{ {
printf("SDP: initialize...\n"); printf("SDP: initialize...\n");
while (!sdp_func->configuration_done) { while (!sdp_func->configuration_done) {
@ -712,7 +712,7 @@ int sdp_init(int controller_index)
} }
schedule(); schedule();
usb_gadget_handle_interrupts(controller_index); dm_usb_gadget_handle_interrupts(udc);
} }
return 0; return 0;
@ -911,9 +911,9 @@ static void sdp_handle_out_ep(void)
} }
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
int sdp_handle(int controller_index) int sdp_handle(struct udevice *udc)
#else #else
int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image, int spl_sdp_handle(struct udevice *udc, struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
#endif #endif
{ {
@ -929,7 +929,7 @@ int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image,
return 0; return 0;
schedule(); schedule();
usb_gadget_handle_interrupts(controller_index); dm_usb_gadget_handle_interrupts(udc);
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
flag = sdp_handle_in_ep(spl_image, bootdev); flag = sdp_handle_in_ep(spl_image, bootdev);

6
include/sdp.h
View file

@ -9,15 +9,15 @@
#ifndef __SDP_H_ #ifndef __SDP_H_
#define __SDP_H_ #define __SDP_H_
int sdp_init(int controller_index); int sdp_init(struct udevice *udc);
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#include <spl.h> #include <spl.h>
int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image, int spl_sdp_handle(struct udevice *udc, struct spl_image_info *spl_image,
struct spl_boot_device *bootdev); struct spl_boot_device *bootdev);
#else #else
int sdp_handle(int controller_index); int sdp_handle(struct udevice *udc);
#endif #endif
#endif /* __SDP_H_ */ #endif /* __SDP_H_ */