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

Commit da7a42d6 authored by Christian Glindkamp's avatar Christian Glindkamp Committed by Russell King
Browse files

[ARM] 4738/1: at91sam9261: Remove udc pullup enabling in board initialisation 



Currently the udc pullup is enabled by default on boot. If the device
is connected to a host at this time, the host starts the negotiation
before the udc/gadget driver is ready to handle it.

Signed-off-by: default avatarChristian Glindkamp <christian.glindkamp@taskit.de>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1b41bdf6

arch/arm/mach-at91/at91sam9261_devices.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -107,8 +107,6 @@ static struct platform_device at91sam9261_udc_device = { 




void __init at91_add_device_udc(struct at91_udc_data *data)

void __init at91_add_device_udc(struct at91_udc_data *data)

{

{

	unsigned long x;



	if (!data)

	if (!data)

		return;

		return;
@@ -117,9 +115,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) 
		at91_set_deglitch(data->vbus_pin, 1);

		at91_set_deglitch(data->vbus_pin, 1);

	}

	}





	/* Pullup pin is handled internally */

	/* Pullup pin is handled internally by USB device peripheral */

	x = at91_sys_read(AT91_MATRIX_USBPUCR);

	at91_sys_write(AT91_MATRIX_USBPUCR, x | AT91_MATRIX_USBPUCR_PUON);





	udc_data = *data;

	udc_data = *data;

	platform_device_register(&at91sam9261_udc_device);

	platform_device_register(&at91sam9261_udc_device);