diff options
author | Wolfgang Denk <wd@denx.de> | 2009-12-01 12:10:51 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-12-01 12:10:51 +0100 |
commit | 57bf140ac66f95c9c36c494e4d027551b5477b01 (patch) | |
tree | 78cc2602ee9dca3284e47f38d29380171fb53646 /board/pandora/pandora.h | |
parent | 34ddbd171ba154e9afd83f07a07ad8b57ac592e3 (diff) | |
parent | 71636fa7c3de63de29c0f514d5c725eccb011657 (diff) | |
download | talos-obmc-uboot-57bf140ac66f95c9c36c494e4d027551b5477b01.tar.gz talos-obmc-uboot-57bf140ac66f95c9c36c494e4d027551b5477b01.zip |
Merge branch 'next-sync' of git://git.denx.de/u-boot-arm into next
Diffstat (limited to 'board/pandora/pandora.h')
-rw-r--r-- | board/pandora/pandora.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/board/pandora/pandora.h b/board/pandora/pandora.h index 5bfa0f9e26..f0ad16b0a4 100644 --- a/board/pandora/pandora.h +++ b/board/pandora/pandora.h @@ -219,7 +219,8 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(UART2_RX), (IEN | PTD | EN | M4)) /*GPIO_147,*/\ /*UART2_RX*/\ /*Serial Interface (Peripheral boot, Linux console, on AV connector)*/\ - MUX_VAL(CP(UART3_RX_IRRX), (IEN | PTD | DIS | M0)) /*UART3_RX*/\ + /*RX pulled up to avoid noise when nothing is connected to serial port*/\ + MUX_VAL(CP(UART3_RX_IRRX), (IEN | PTU | EN | M0)) /*UART3_RX*/\ MUX_VAL(CP(UART3_TX_IRTX), (IDIS | PTD | DIS | M0)) /*UART3_TX*/\ /*LEDs (Controlled by OMAP)*/\ MUX_VAL(CP(MMC1_DAT6), (IDIS | PTD | DIS | M4)) /*GPIO_128*/\ |