Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8134ff55 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low 



Allows to configure independently the vbus_pin associated with each port.
Matches usual naming scheme.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb@vger.kernel.org
parent 6813463c

arch/arm/mach-at91/include/mach/board.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ extern void __init at91_add_device_eth(struct macb_platform_data *data); 
struct at91_usbh_data {

	u8		ports;		/* number of ports on root hub */

	int		vbus_pin[2];	/* port power-control pin */

	u8              vbus_pin_inverted;

	u8              vbus_pin_active_low[2];

	u8              overcurrent_supported;

	int             overcurrent_pin[2];

	u8              overcurrent_status[2];

drivers/usb/host/ohci-at91.c

+4 −2
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int 
	if (!gpio_is_valid(pdata->vbus_pin[port]))

		return;



	gpio_set_value(pdata->vbus_pin[port], !pdata->vbus_pin_inverted ^ enable);

	gpio_set_value(pdata->vbus_pin[port],

		       !pdata->vbus_pin_active_low[port] ^ enable);

}



static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
@@ -255,7 +256,8 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port) 
	if (!gpio_is_valid(pdata->vbus_pin[port]))

		return -EINVAL;



	return gpio_get_value(pdata->vbus_pin[port]) ^ !pdata->vbus_pin_inverted;

	return gpio_get_value(pdata->vbus_pin[port]) ^

		!pdata->vbus_pin_active_low[port];

}



/*