Skip to contentSkip to conversation

ARM: at91/usbh: fix overcurrent gpio setup

PATCH New Johan Hovold 2 participants 2 messages Nov 14, 2012 – Nov 16, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

PATCH 1/1 ARM: at91/usbh: fix overcurrent gpio setup

Use gpio_is_valid also for overcurrent pins (which are currently negative in many board files).

Signed-off-by Johan Hovold <[email protected]>
---
 arch/arm/mach-at91/at91rm9200_devices.c  | 2 +-
 arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
 arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
 arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-at91/at91rm9200_devices.c +1 -1
index 1e122bc..3cee0e6 100644
@@ -68,7 +68,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
 	/* Enable overcurrent notification */
 	for (i = 0; i < data->ports; i++) {
-		if (data->overcurrent_pin[i])
+		if (gpio_is_valid(data->overcurrent_pin[i]))
 			at91_set_gpio_input(data->overcurrent_pin[i], 1);
 	}
arch/arm/mach-at91/at91sam9260_devices.c +1 -1
index aa1e587..414bd85 100644
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
 	/* Enable overcurrent notification */
 	for (i = 0; i < data->ports; i++) {
-		if (data->overcurrent_pin[i])
+		if (gpio_is_valid(data->overcurrent_pin[i]))
 			at91_set_gpio_input(data->overcurrent_pin[i], 1);
 	}
arch/arm/mach-at91/at91sam9261_devices.c +1 -1
index b948769..cd604aa 100644
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
 	/* Enable overcurrent notification */
 	for (i = 0; i < data->ports; i++) {
-		if (data->overcurrent_pin[i])
+		if (gpio_is_valid(data->overcurrent_pin[i]))
 			at91_set_gpio_input(data->overcurrent_pin[i], 1);
 	}
arch/arm/mach-at91/at91sam9263_devices.c +1 -1
index cb85da2..9c61e59 100644
@@ -78,7 +78,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
 	/* Enable overcurrent notification */
 	for (i = 0; i < data->ports; i++) {
-		if (data->overcurrent_pin[i])
+		if (gpio_is_valid(data->overcurrent_pin[i]))
 			at91_set_gpio_input(data->overcurrent_pin[i], 1);
 	}
Signature · 1 line
1.8.0
#1 lore raw

PATCH 1/1 ARM: at91/usbh: fix overcurrent gpio setup

On 11/14/2012 12:18 PM, Johan Hovold :

Quoted 4 lines

Use gpio_is_valid also for overcurrent pins (which are currently negative in many board files).

Signed-off-by Johan Hovold <[email protected]>
Acked-by Nicolas Ferre <[email protected]>

Queued in at91-fixes for 3.7-final.

Thanks a lot. Best regards,

Quoted 60 lines
---
 arch/arm/mach-at91/at91rm9200_devices.c  | 2 +-
 arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
 arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
 arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-at91/at91rm9200_devices.c +1 -1
index 1e122bc..3cee0e6 100644
@@ -68,7 +68,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
 	/* Enable overcurrent notification */
 	for (i = 0; i < data->ports; i++) {
-		if (data->overcurrent_pin[i])
+		if (gpio_is_valid(data->overcurrent_pin[i]))
 			at91_set_gpio_input(data->overcurrent_pin[i], 1);
 	}
arch/arm/mach-at91/at91sam9260_devices.c +1 -1
index aa1e587..414bd85 100644
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
 	/* Enable overcurrent notification */
 	for (i = 0; i < data->ports; i++) {
-		if (data->overcurrent_pin[i])
+		if (gpio_is_valid(data->overcurrent_pin[i]))
 			at91_set_gpio_input(data->overcurrent_pin[i], 1);
 	}
arch/arm/mach-at91/at91sam9261_devices.c +1 -1
index b948769..cd604aa 100644
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
 	/* Enable overcurrent notification */
 	for (i = 0; i < data->ports; i++) {
-		if (data->overcurrent_pin[i])
+		if (gpio_is_valid(data->overcurrent_pin[i]))
 			at91_set_gpio_input(data->overcurrent_pin[i], 1);
 	}
arch/arm/mach-at91/at91sam9263_devices.c +1 -1
index cb85da2..9c61e59 100644
@@ -78,7 +78,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
 	/* Enable overcurrent notification */
 	for (i = 0; i < data->ports; i++) {
-		if (data->overcurrent_pin[i])
+		if (gpio_is_valid(data->overcurrent_pin[i]))
 			at91_set_gpio_input(data->overcurrent_pin[i], 1);
 	}
Signature · 1 line
Nicolas Ferre