Merge branch 'next'

[u-boot] / drivers / usb / host / r8a66597-hcd.c

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index db611b641fc57d11cccc57cbd6b4a868adaf0d64..2a4e7ff4b3720b9e1eb92acb7768f3d6ca940667 100644 (file)
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -497,7 +497,7 @@ static void r8a66597_check_syssts(struct r8a66597 *r8a66597, int port)
 
        old_syssts = r8a66597_read(r8a66597, get_syssts_reg(port) & LNST);
        while (count > 0) {
-               wait_ms(R8A66597_RH_POLL_TIME);
+               mdelay(R8A66597_RH_POLL_TIME);
 
                syssts = r8a66597_read(r8a66597, get_syssts_reg(port) & LNST);
                if (syssts == old_syssts) {
@@ -511,11 +511,11 @@ static void r8a66597_check_syssts(struct r8a66597 *r8a66597, int port)
 
 static void r8a66597_bus_reset(struct r8a66597 *r8a66597, int port)
 {
-       wait_ms(10);
+       mdelay(10);
        r8a66597_mdfy(r8a66597, USBRST, USBRST | UACT, get_dvstctr_reg(port));
-       wait_ms(50);
+       mdelay(50);
        r8a66597_mdfy(r8a66597, UACT, USBRST | UACT, get_dvstctr_reg(port));
-       wait_ms(50);
+       mdelay(50);
 }
 
 static int check_usb_device_connecting(struct r8a66597 *r8a66597)
@@ -823,7 +823,7 @@ static int r8a66597_submit_rh_msg(struct usb_device *dev, unsigned long pipe,
                stat = USB_ST_STALLED;
        }
 
-       wait_ms(1);
+       mdelay(1);
 
        len = min_t(int, len, leni);
 
@@ -908,13 +908,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
        return 0;
 }
 
-void usb_event_poll(void)
-{
-       /* no implement */
-       R8A66597_DPRINT("%s\n", __func__);
-}
-
-int usb_lowlevel_init(void)
+int usb_lowlevel_init(int index, void **controller))
 {
        struct r8a66597 *r8a66597 = &gr8a66597;
 
@@ -924,7 +918,7 @@ int usb_lowlevel_init(void)
        r8a66597->reg = CONFIG_R8A66597_BASE_ADDR;
 
        disable_controller(r8a66597);
-       wait_ms(100);
+       mdelay(100);
 
        enable_controller(r8a66597);
        r8a66597_port_power(r8a66597, 0 , 1);
@@ -932,12 +926,12 @@ int usb_lowlevel_init(void)
        /* check usb device */
        check_usb_device_connecting(r8a66597);
 
-       wait_ms(50);
+       mdelay(50);
 
        return 0;
 }
 
-int usb_lowlevel_stop(void)
+int usb_lowlevel_stop(int index)
 {
        disable_controller(&gr8a66597);