aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-at91')
-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);