Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx

[u-boot] / drivers / usb / gadget / pxa27x_udc.c

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 0d3a9886f99fd063db05afa15bb686c5db988950..71cc0f2a0562ad4d75141a9388180a2ffe7da482 100644 (file)
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -195,12 +195,12 @@ static int udc_read_urb_ep0(void)
 
        for (i = 0; i < w; i++) {
                data32[ep0_urb->actual_length / 4 + i] = readl(UDCDN(0));
-//             ep0_urb->actual_length += 4;
+               /* ep0_urb->actual_length += 4; */
        }
 
        for (i = 0; i < b; i++) {
                data8[ep0_urb->actual_length + w * 4 + i] = readb(UDCDN(0));
-//             ep0_urb->actual_length++;
+               /* ep0_urb->actual_length++; */
        }
 
        ep0_urb->actual_length += n;
@@ -599,7 +599,6 @@ void udc_setup_ep(struct usb_device_instance *device, unsigned int id,
 
        writel(tmp, UDCCN(ep_num));
 
-       //usbdbg
        usbdbg("UDCCR%c = %x", 'A' + ep_num-1, readl(UDCCN(ep_num)));
        usbdbg("UDCCSR%c = %x", 'A' + ep_num-1, readl(UDCCSN(ep_num)));
 }
@@ -611,7 +610,9 @@ void udc_connect(void)
 
 #ifdef CONFIG_USB_DEV_PULLUP_GPIO
        /* Turn on the USB connection by enabling the pullup resistor */
-       set_GPIO_mode(CONFIG_USB_DEV_PULLUP_GPIO | GPIO_OUT);
+       writel(readl(GPDR(CONFIG_USB_DEV_PULLUP_GPIO))
+                    | GPIO_bit(CONFIG_USB_DEV_PULLUP_GPIO),
+              GPDR(CONFIG_USB_DEV_PULLUP_GPIO));
        writel(GPIO_bit(CONFIG_USB_DEV_PULLUP_GPIO), GPSR(CONFIG_USB_DEV_PULLUP_GPIO));
 #else
        /* Host port 2 transceiver D+ pull up enable */