From b9180ae14a7953a9a2ddd438cdf60a55d8350b5c Mon Sep 17 00:00:00 2001 From: Christian Glindkamp Date: Thu, 3 Jan 2008 12:15:23 +0100 Subject: [PATCH] --- yaml --- r: 77436 b: refs/heads/master c: da7a42d60ba214937ddb35152f336a4e4baa49a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/at91sam9261_devices.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 77996684d48d..3b42157f7669 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b41bdf68a72c1fd506ee3dbfbf954fd2eaef75c +refs/heads/master: da7a42d60ba214937ddb35152f336a4e4baa49a6 diff --git a/trunk/arch/arm/mach-at91/at91sam9261_devices.c b/trunk/arch/arm/mach-at91/at91sam9261_devices.c index 57d7e3bd05db..245641263fce 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261_devices.c +++ b/trunk/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);