aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChristian Glindkamp <christian.glindkamp@taskit.de>2008-01-03 06:15:23 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 10:00:33 -0500
commitda7a42d60ba214937ddb35152f336a4e4baa49a6 (patch)
tree378bad8a670a44b3682a931e1424dc84f0bd1d9e /arch
parent1b41bdf68a72c1fd506ee3dbfbf954fd2eaef75c (diff)
[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')
-rw-r--r--arch/arm/mach-at91/at91sam9261_devices.c6
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 = {
107 107
108void __init at91_add_device_udc(struct at91_udc_data *data) 108void __init at91_add_device_udc(struct at91_udc_data *data)
109{ 109{
110 unsigned long x;
111
112 if (!data) 110 if (!data)
113 return; 111 return;
114 112
@@ -117,9 +115,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
117 at91_set_deglitch(data->vbus_pin, 1); 115 at91_set_deglitch(data->vbus_pin, 1);
118 } 116 }
119 117
120 /* Pullup pin is handled internally */ 118 /* Pullup pin is handled internally by USB device peripheral */
121 x = at91_sys_read(AT91_MATRIX_USBPUCR);
122 at91_sys_write(AT91_MATRIX_USBPUCR, x | AT91_MATRIX_USBPUCR_PUON);
123 119
124 udc_data = *data; 120 udc_data = *data;
125 platform_device_register(&at91sam9261_udc_device); 121 platform_device_register(&at91sam9261_udc_device);