diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-11-24 23:22:50 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-11-24 23:22:50 +0100 |
| commit | 7c32dc5bed053348003da5ba3635d4c61c420e66 (patch) | |
| tree | c51381ae8c692a639bb60f45bb81a4f40603d5ad | |
| parent | b25e38fc36e13fa8037fa4d37fe909d1d6e6f372 (diff) | |
| parent | 01826abc02ce160501534788e63629ccbe31b05c (diff) | |
| download | u-boot-imx-7c32dc5bed053348003da5ba3635d4c61c420e66.zip u-boot-imx-7c32dc5bed053348003da5ba3635d4c61c420e66.tar.gz u-boot-imx-7c32dc5bed053348003da5ba3635d4c61c420e66.tar.bz2 | |
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm
| -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 5bfa0f9..f0ad16b 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*/\ |