diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-16 23:00:53 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-16 23:00:53 +0100 |
| commit | 006915fbb0e3c1c9927fe32c4e92cb011f8499e7 (patch) | |
| tree | b477df920f7d638a0472aa1d6bfa5ff71243448c /arch/arm/cpu/arm926ejs/at91 | |
| parent | 98e69567022eb2138dd99554b3a2e80522a1b153 (diff) | |
| parent | b5d58d8500bfb918c7fec56f241e6ee1078c2be0 (diff) | |
| download | u-boot-imx-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.zip u-boot-imx-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.tar.gz u-boot-imx-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.tar.bz2 | |
Merge branch 'master' of ../master into next
Diffstat (limited to 'arch/arm/cpu/arm926ejs/at91')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c index f699f4d..c1822b7 100644 --- a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c @@ -204,6 +204,11 @@ void at91_macb_hw_init(void) #else at91_set_b_periph(AT91_PIO_PORTA, 23, 0); /* ETX2 */ at91_set_b_periph(AT91_PIO_PORTA, 24, 0); /* ETX3 */ +#if defined(CONFIG_AT91SAM9G20) + /* 9G20 BOOT ROM initializes those pins to multi-drive, undo that */ + at91_set_pio_multi_drive(AT91_PIO_PORTA, 23, 0); + at91_set_pio_multi_drive(AT91_PIO_PORTA, 24, 0); +#endif #endif at91_set_b_periph(AT91_PIO_PORTA, 22, 0); /* ETXER */ #endif |