diff options
| author | Christian Glindkamp <christian.glindkamp@taskit.de> | 2008-01-03 12:15:23 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-26 15:00:33 +0000 |
| commit | da7a42d60ba214937ddb35152f336a4e4baa49a6 (patch) | |
| tree | 378bad8a670a44b3682a931e1424dc84f0bd1d9e /arch/arm/mach-at91 | |
| parent | 1b41bdf68a72c1fd506ee3dbfbf954fd2eaef75c (diff) | |
| download | linux-da7a42d60ba214937ddb35152f336a4e4baa49a6.tar.gz linux-da7a42d60ba214937ddb35152f336a4e4baa49a6.tar.bz2 linux-da7a42d60ba214937ddb35152f336a4e4baa49a6.zip | |
[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: Christian Glindkamp <christian.glindkamp@taskit.de>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 57d7e3bd05db..245641263fce 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -107,8 +107,6 @@ static struct platform_device at91sam9261_udc_device = { void __init at91_add_device_udc(struct at91_udc_data *data) { - unsigned long x; - if (!data) return; @@ -117,9 +115,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) at91_set_deglitch(data->vbus_pin, 1); } - /* Pullup pin is handled internally */ - x = at91_sys_read(AT91_MATRIX_USBPUCR); - at91_sys_write(AT91_MATRIX_USBPUCR, x | AT91_MATRIX_USBPUCR_PUON); + /* Pullup pin is handled internally by USB device peripheral */ udc_data = *data; platform_device_register(&at91sam9261_udc_device); |