diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-12 11:47:54 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-12 11:47:54 +0200 |
| commit | 224f7a56796868f544664a48b51c2450850e1b9c (patch) | |
| tree | 7d20cf55239b4632d6d4251ada0383c1370bb5b0 /board/imx31_phycore | |
| parent | c9c101c660b3d1995045c61c7c6041f52b6cf335 (diff) | |
| parent | 565ffbb9ee0ac0f49636621969bc66a02c4e2b44 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/imx31_phycore')
| -rw-r--r-- | board/imx31_phycore/imx31_phycore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c index 42ecb1e088..ae93444a16 100644 --- a/board/imx31_phycore/imx31_phycore.c +++ b/board/imx31_phycore/imx31_phycore.c @@ -54,11 +54,11 @@ int board_init (void) mx31_gpio_mux(MUX_RXD1__UART1_RXD_MUX); mx31_gpio_mux(MUX_TXD1__UART1_TXD_MUX); mx31_gpio_mux(MUX_RTS1__UART1_RTS_B); - mx31_gpio_mux(MUX_RTS1__UART1_CTS_B); + mx31_gpio_mux(MUX_CTS1__UART1_CTS_B); /* setup pins for I2C2 (for EEPROM, RTC) */ mx31_gpio_mux(MUX_CSPI2_MOSI__I2C2_SCL); - mx31_gpio_mux(MUX_CSPI2_MISO__I2C2_SCL); + mx31_gpio_mux(MUX_CSPI2_MISO__I2C2_SDA); gd->bd->bi_arch_number = 447; /* board id for linux */ gd->bd->bi_boot_params = (0x80000100); /* adress of boot parameters */ |