[PATCH 2/2] mioa701: move gpio-pullup functionality to gpio-vbus

Dmitry Eremin-Solenikov dbaryshkov at gmail.com
Wed Jun 22 08:40:52 EDT 2011


Oops... See bellow,

On 6/22/11, Dmitry Eremin-Solenikov <dbaryshkov at gmail.com> wrote:
> gpio-vbus can (and should?) handle D+ pullup gpio for us. Move gpio-pullup
> handling
> to gpio-vbus and stop providing udc_info as it's empty now.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
> ---
>  arch/arm/mach-pxa/mioa701.c |    7 +------
>  1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
> index bcbd359..e712c9d 100644
> --- a/arch/arm/mach-pxa/mioa701.c
> +++ b/arch/arm/mach-pxa/mioa701.c
> @@ -402,14 +402,10 @@ static void gsm_exit(void)
>  /*
>   * USB UDC
>   */
> -static struct pxa2xx_udc_mach_info mioa701_udc_info = {
> -	.gpio_pullup	  = GPIO22_USB_ENABLE,
> -};
> -
>  struct gpio_vbus_mach_info gpio_vbus_data = {
>  	.gpio_vbus = GPIO13_nUSB_DETECT,
>  	.gpio_vbus_inverted = 1,
> -	.gpio_pullup = -1,
> +	.gpio_pullup = GPIO22_USB_ENABLE,

This should be also
+	.disconnect_on_suspend = 1,

>  };
>
>  /*
> @@ -770,7 +766,6 @@ static void __init mioa701_machine_init(void)
>  	pxa_set_fb_info(NULL, &mioa701_pxafb_info);
>  	pxa_set_mci_info(&mioa701_mci_info);
>  	pxa_set_keypad_info(&mioa701_keypad_info);
> -	pxa_set_udc_info(&mioa701_udc_info);
>  	pxa_set_ac97_info(&mioa701_ac97_info);
>  	pm_power_off = mioa701_poweroff;
>  	arm_pm_restart = mioa701_restart;
> --
> 1.7.5.3
>
>


-- 
With best wishes
Dmitry



More information about the linux-arm-kernel mailing list