|
|
@@ -0,0 +1,84 @@
|
|
|
+--- a/arch/arm/mach-at91/at91cap9_devices.c
|
|
|
++++ b/arch/arm/mach-at91/at91cap9_devices.c
|
|
|
+@@ -77,7 +77,7 @@
|
|
|
+ /* Enable VBus control for UHP ports */
|
|
|
+ for (i = 0; i < data->ports; i++) {
|
|
|
+ if (data->vbus_pin[i])
|
|
|
+- at91_set_gpio_output(data->vbus_pin[i], 0);
|
|
|
++ at91_set_gpio_output(data->vbus_pin[i], data->vbus_active_high);
|
|
|
+ }
|
|
|
+
|
|
|
+ usbh_data = *data;
|
|
|
+--- a/arch/arm/mach-at91/at91sam9263_devices.c
|
|
|
++++ b/arch/arm/mach-at91/at91sam9263_devices.c
|
|
|
+@@ -71,7 +71,7 @@
|
|
|
+ /* Enable VBus control for UHP ports */
|
|
|
+ for (i = 0; i < data->ports; i++) {
|
|
|
+ if (data->vbus_pin[i])
|
|
|
+- at91_set_gpio_output(data->vbus_pin[i], 0);
|
|
|
++ at91_set_gpio_output(data->vbus_pin[i], data->vbus_active_high);
|
|
|
+ }
|
|
|
+
|
|
|
+ usbh_data = *data;
|
|
|
+--- a/arch/arm/mach-at91/at91sam9g45_devices.c
|
|
|
++++ b/arch/arm/mach-at91/at91sam9g45_devices.c
|
|
|
+@@ -119,7 +119,7 @@
|
|
|
+ /* Enable VBus control for UHP ports */
|
|
|
+ for (i = 0; i < data->ports; i++) {
|
|
|
+ if (data->vbus_pin[i])
|
|
|
+- at91_set_gpio_output(data->vbus_pin[i], 0);
|
|
|
++ at91_set_gpio_output(data->vbus_pin[i], data->vbus_active_high);
|
|
|
+ }
|
|
|
+
|
|
|
+ usbh_ohci_data = *data;
|
|
|
+@@ -174,7 +174,7 @@
|
|
|
+ /* Enable VBus control for UHP ports */
|
|
|
+ for (i = 0; i < data->ports; i++) {
|
|
|
+ if (data->vbus_pin[i])
|
|
|
+- at91_set_gpio_output(data->vbus_pin[i], 0);
|
|
|
++ at91_set_gpio_output(data->vbus_pin[i], data->vbus_active_high);
|
|
|
+ }
|
|
|
+
|
|
|
+ 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 @@
|
|
|
+
|
|
|
+ /* USB Host */
|
|
|
+ struct at91_usbh_data {
|
|
|
+- u8 ports; /* number of ports on root hub */
|
|
|
+- u8 vbus_pin[2]; /* port power-control pin */
|
|
|
++ u8 ports; /* number of ports on root hub */
|
|
|
++ u8 vbus_pin[2]; /* port power-control pin */
|
|
|
++ u8 vbus_active_high; /* true == vbus_pins are active high */
|
|
|
+ };
|
|
|
+ extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
|
|
|
+ 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 @@
|
|
|
+ if (pdata) {
|
|
|
+ /* REVISIT make the driver support per-port power switching,
|
|
|
+ * and also overcurrent detection. Here we assume the ports
|
|
|
+- * are always powered while this driver is active, and use
|
|
|
+- * active-low power switches.
|
|
|
++ * are always powered while this driver is active.
|
|
|
+ */
|
|
|
+ for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
|
|
|
+ if (pdata->vbus_pin[i] <= 0)
|
|
|
+ continue;
|
|
|
+ gpio_request(pdata->vbus_pin[i], "ohci_vbus");
|
|
|
+- gpio_direction_output(pdata->vbus_pin[i], 0);
|
|
|
++ gpio_direction_output(pdata->vbus_pin[i], pdata->vbus_active_high);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+@@ -301,7 +300,7 @@
|
|
|
+ for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
|
|
|
+ if (pdata->vbus_pin[i] <= 0)
|
|
|
+ continue;
|
|
|
+- gpio_direction_output(pdata->vbus_pin[i], 1);
|
|
|
++ gpio_direction_output(pdata->vbus_pin[i], !pdata->vbus_active_high);
|
|
|
+ gpio_free(pdata->vbus_pin[i]);
|
|
|
+ }
|
|
|
+ }
|