usbd: use s/w reset when downloading is complete

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/arch/arm/cpu/armv7/s5p-common/usb_downloader.c b/arch/arm/cpu/armv7/s5p-common/usb_downloader.c
index 5392e86..f5ba688 100644 (file)
--- a/arch/arm/cpu/armv7/s5p-common/usb_downloader.c
+++ b/arch/arm/cpu/armv7/s5p-common/usb_downloader.c
@@ -205,7 +205,6 @@ struct usbd_ops *usbd_set_interface(struct usbd_ops *usbd)
 #ifdef CONFIG_GENERIC_MMC
        usbd_set_mmc_dev(usbd);
 #endif
-       usbd->cpu_reset = s5pc1xx_wdt_reset;
 
        return usbd;
 }

diff --git a/board/samsung/universal_c110/universal.c b/board/samsung/universal_c110/universal.c
index a55935b..566e9b6 100644 (file)
--- a/board/samsung/universal_c110/universal.c
+++ b/board/samsung/universal_c110/universal.c
@@ -1588,7 +1588,7 @@ static void check_micro_usb(int intr)
        }
 
        /* If reset status is watchdog reset then skip it */
-       if (!(get_reset_status() & WDTRESET)) {
+       if (!(get_reset_status() & SWRESET)) {
                /* If Factory Mode is Boot ON-USB, go to download mode */
                i2c_read(addr, 0x07, 1, val, 1);
 

diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 3251da0..b04699f 100644 (file)
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -371,7 +371,7 @@ static void check_micro_usb(int intr)
 #endif
 
        /* If reset status is watchdog reset then skip it */
-       if (get_reset_status() != WDTRESET) {
+       if (get_reset_status() != SWRESET) {
                /* If Factory Mode is Boot ON-USB, go to download mode */
                i2c_read(addr, 0x07, 1, val, 1);