diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-08 23:17:57 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-08 23:17:57 +0100 |
| commit | b097b9282c96ee0a10fc5e64894be440e075335d (patch) | |
| tree | caf53bd1ac96587323f1d69b6770b19e8155a772 /arch/arm/cpu/arm926ejs | |
| parent | a430b137eb578cf73be476ff05a43baa2aba1ad8 (diff) | |
| parent | a429db7e3ce6136f80f22584588247926ba60b05 (diff) | |
| download | u-boot-imx-b097b9282c96ee0a10fc5e64894be440e075335d.zip u-boot-imx-b097b9282c96ee0a10fc5e64894be440e075335d.tar.gz u-boot-imx-b097b9282c96ee0a10fc5e64894be440e075335d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -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 |