kernel: update kernel from 2.6.38.2 to 2.6.38.6 and refresh patches

[openwrt.git] / target / linux / at91 / patches / 600-usb_vbus_active_high.patch

diff --git a/target/linux/at91/patches/600-usb_vbus_active_high.patch b/target/linux/at91/patches/600-usb_vbus_active_high.patch
index 0a55ac6..08dfcb3 100644 (file)
--- a/target/linux/at91/patches/600-usb_vbus_active_high.patch
+++ b/target/linux/at91/patches/600-usb_vbus_active_high.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-at91/at91cap9_devices.c
 +++ b/arch/arm/mach-at91/at91cap9_devices.c
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ void __init at91_add_device_usbh(struct
        /* Enable VBus control for UHP ports */
        for (i = 0; i < data->ports; i++) {
                if (data->vbus_pin[i])
@@ -11,7 +11,7 @@
        usbh_data = *data;
 --- a/arch/arm/mach-at91/at91sam9263_devices.c
 +++ b/arch/arm/mach-at91/at91sam9263_devices.c
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ void __init at91_add_device_usbh(struct
        /* Enable VBus control for UHP ports */
        for (i = 0; i < data->ports; i++) {
                if (data->vbus_pin[i])
@@ -22,7 +22,7 @@
        usbh_data = *data;
 --- a/arch/arm/mach-at91/at91sam9g45_devices.c
 +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
-@@ -119,7 +119,7 @@
+@@ -121,7 +121,7 @@ void __init at91_add_device_usbh_ohci(st
        /* Enable VBus control for UHP ports */
        for (i = 0; i < data->ports; i++) {
                if (data->vbus_pin[i])
@@ -31,7 +31,7 @@
        }
  
        usbh_ohci_data = *data;
-@@ -174,7 +174,7 @@
+@@ -176,7 +176,7 @@ void __init at91_add_device_usbh_ehci(st
        /* Enable VBus control for UHP ports */
        for (i = 0; i < data->ports; i++) {
                if (data->vbus_pin[i])
@@ -42,7 +42,7 @@
        usbh_ehci_data = *data;
 --- a/arch/arm/mach-at91/include/mach/board.h
 +++ b/arch/arm/mach-at91/include/mach/board.h
-@@ -93,8 +93,9 @@
+@@ -96,8 +96,9 @@ extern void __init at91_add_device_eth(s
  
   /* USB Host */
  struct at91_usbh_data {
@@ -56,7 +56,7 @@
  extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
 --- a/drivers/usb/host/ohci-at91.c
 +++ b/drivers/usb/host/ohci-at91.c
-@@ -277,14 +277,13 @@
+@@ -277,14 +277,13 @@ static int ohci_hcd_at91_drv_probe(struc
        if (pdata) {
                /* REVISIT make the driver support per-port power switching,
                 * and also overcurrent detection.  Here we assume the ports
@@ -73,7 +73,7 @@
                }
        }
  
-@@ -301,7 +300,7 @@
+@@ -301,7 +300,7 @@ static int ohci_hcd_at91_drv_remove(stru
                for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
                        if (pdata->vbus_pin[i] <= 0)
                                continue;