diff options
| author | Ludovic Desroches | 2012-09-12 08:42:13 +0200 |
|---|---|---|
| committer | Wolfram Sang | 2012-09-12 14:49:14 +0200 |
| commit | 94e734655fbe294c50d304547cae033e87ec229e (patch) | |
| tree | 7a71f929c75bd2990f146ed67de183cf14dd5dce /arch/arm/mach-at91 | |
| parent | arm: at91: G45 TWI: remove open drain setting for twi function gpios (diff) | |
| download | kernel-qcow2-linux-94e734655fbe294c50d304547cae033e87ec229e.tar.gz kernel-qcow2-linux-94e734655fbe294c50d304547cae033e87ec229e.tar.xz kernel-qcow2-linux-94e734655fbe294c50d304547cae033e87ec229e.zip | |
ARM: at91: do not configure at91sam9g10 twi pio as open-drain
As indicated in the datasheet, TWD and TWCK must not be programmed as
open-drain.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Nikolaus Voss <n.voss@weinmann.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 29188ef7422b..50d317940f5a 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -327,16 +327,16 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) /* IP version is not the same on 9261 and g10 */ if (cpu_is_at91sam9g10()) { at91sam9261_twi_device.name = "i2c-at91sam9g10"; + /* I2C PIO must not be configured as open-drain on this chip */ } else { at91sam9261_twi_device.name = "i2c-at91sam9261"; + at91_set_multi_drive(AT91_PIN_PA7, 1); + at91_set_multi_drive(AT91_PIN_PA8, 1); } /* pins used for TWI interface */ at91_set_A_periph(AT91_PIN_PA7, 0); /* TWD */ - at91_set_multi_drive(AT91_PIN_PA7, 1); - at91_set_A_periph(AT91_PIN_PA8, 0); /* TWCK */ - at91_set_multi_drive(AT91_PIN_PA8, 1); i2c_register_board_info(0, devices, nr_devices); platform_device_register(&at91sam9261_twi_device); |