MLK-20559-5 f_sdp: Add a callback to clean up USB driver

Because SDP directly jumps to next level boot image, we'd better
clean up the USB driver before it. Implement a weak callback function,
that spl sdp can use it to clean up USB driver.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 1f6b3efc62cb277fd4316d8ed5115f47b09369a0)

diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index b15f1a5..f5f6735 100644 (file)
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -10,6 +10,11 @@
 #include <g_dnl.h>
 #include <sdp.h>
 
+void board_sdp_cleanup(void)
+{
+       board_usb_cleanup(CONFIG_SPL_SDP_USB_DEV, USB_INIT_DEVICE);
+}
+
 static int spl_sdp_load_image(struct spl_image_info *spl_image,
                              struct spl_boot_device *bootdev)
 {

diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index af76a7b..ebf40dc 100644 (file)
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -247,6 +247,10 @@ static struct usb_gadget_strings *sdp_generic_strings[] = {
        NULL,
 };
 
+void __weak board_sdp_cleanup(void)
+{
+}
+
 static inline void *sdp_ptr(u32 val)
 {
        return (void *)(uintptr_t)val;
@@ -748,6 +752,8 @@ static void sdp_handle_in_ep(void)
                                        (struct image_header *)(ulong)(sdp_func->jmp_address));
                        }
 
+                       board_sdp_cleanup();
+
                        jump_to_image_no_args(&spl_image);
 #else
                        /* In U-Boot, allow jumps to scripts */