diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-11-30 10:43:04 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-11-30 10:43:04 +0100 |
| commit | 4f47f2f1c8c46ac87c4e0a5708f950fdb59a2a17 (patch) | |
| tree | 593eeada2af1ddf0368e7e546a8d8d8ed5f3f027 /board | |
| parent | b926de66e515762d2ccbc6b79185305b88e46218 (diff) | |
| parent | 824d82997fbcf28e49081d36fdd5d3be1b92b03d (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'board')
| -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 5bfa0f9e2..f0ad16b0a 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*/\ |