From 5a61377c56748dc51e042d5d91fbbd4d7d24d587 Mon Sep 17 00:00:00 2001 From: Nikolaus Voss Date: Tue, 8 Nov 2011 12:11:03 +0100 Subject: [PATCH] --- yaml --- r: 333369 b: refs/heads/master c: 774c8018d2566207c92f47b6421dad7d88bbfd49 h: refs/heads/master i: 333367: 1f72053d9cb2b45d7cbe7f8ed0df94e226bcd79a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/at91sam9g45_devices.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 05abfb70ef8d..3736ab3f3420 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fac368a040484293006bb488e67972aafcf88ec7 +refs/heads/master: 774c8018d2566207c92f47b6421dad7d88bbfd49 diff --git a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c index ac1b0f8c3b31..0fcd8718770f 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c @@ -686,18 +686,12 @@ void __init at91_add_device_i2c(short i2c_id, struct i2c_board_info *devices, in /* pins used for TWI interface */ if (i2c_id == 0) { at91_set_A_periph(AT91_PIN_PA20, 0); /* TWD */ - at91_set_multi_drive(AT91_PIN_PA20, 1); - at91_set_A_periph(AT91_PIN_PA21, 0); /* TWCK */ - at91_set_multi_drive(AT91_PIN_PA21, 1); platform_device_register(&at91sam9g45_twi0_device); } else { at91_set_A_periph(AT91_PIN_PB10, 0); /* TWD */ - at91_set_multi_drive(AT91_PIN_PB10, 1); - at91_set_A_periph(AT91_PIN_PB11, 0); /* TWCK */ - at91_set_multi_drive(AT91_PIN_PB11, 1); platform_device_register(&at91sam9g45_twi1_device); }