Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

diff --git a/board/pandora/pandora.h b/board/pandora/pandora.h
index 5bfa0f9e26769f61c0dfa886af7a176641bcf7b6..f0ad16b0a407345cf9497fb8d1bd878c193198d4 100644 (file)
--- 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*/\