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

Commit 1014cc38 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Eric Miao
Browse files

ARM: pxa: drop gpio_vbus field from pxa2xx_udc_mach_info 



Neither pxa25x_udc, nor pxa27x_udc use gpio_vbus/gpio_vbus_inverted
anymore. Drop those two fields from udc info completely.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent a8ecc860

arch/arm/include/asm/mach/udc_pxa2xx.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ struct pxa2xx_udc_mach_info { 
	 * VBUS IRQ and omit the methods above.  Store the GPIO number

	 * here.  Note that sometimes the signals go through inverters...

	 */

	bool	gpio_vbus_inverted;

	int	gpio_vbus;			/* high == vbus present */

	bool	gpio_pullup_inverted;

	int	gpio_pullup;			/* high == pullup activated */

};

arch/arm/mach-pxa/corgi.c

+0 −1
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ static struct pxaficp_platform_data corgi_ficp_platform_data = { 
 * USB Device Controller

 */

static struct pxa2xx_udc_mach_info udc_info __initdata = {

	.gpio_vbus		= -1,

	/* no connect GPIO; corgi can't tell connection status */

	.gpio_pullup		= CORGI_GPIO_USB_PULLUP,

};

arch/arm/mach-pxa/devices.c

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ void __init pxa_set_mci_info(struct pxamci_platform_data *info) 


static struct pxa2xx_udc_mach_info pxa_udc_info = {

	.gpio_pullup = -1,

	.gpio_vbus   = -1,

};



void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)