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_litekit/imx31_litekit.c | |
| parent | c9c101c660b3d1995045c61c7c6041f52b6cf335 (diff) | |
| parent | 565ffbb9ee0ac0f49636621969bc66a02c4e2b44 (diff) | |
| download | talos-obmc-uboot-224f7a56796868f544664a48b51c2450850e1b9c.tar.gz talos-obmc-uboot-224f7a56796868f544664a48b51c2450850e1b9c.zip | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/imx31_litekit/imx31_litekit.c')
| -rw-r--r-- | board/imx31_litekit/imx31_litekit.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/board/imx31_litekit/imx31_litekit.c b/board/imx31_litekit/imx31_litekit.c index 263dd9f7d1..cb3e174841 100644 --- a/board/imx31_litekit/imx31_litekit.c +++ b/board/imx31_litekit/imx31_litekit.c @@ -50,16 +50,16 @@ 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); /* SPI2 */ - mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SS2); - mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SCLK); - mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SPI_RDY); - mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_MOSI); - mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_MISO); - mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SS0); - mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SS1); + mx31_gpio_mux(MUX_CSPI2_SS2__CSPI2_SS2_B); + mx31_gpio_mux(MUX_CSPI2_SCLK__CSPI2_CLK); + mx31_gpio_mux(MUX_CSPI2_SPI_RDY__CSPI2_DATAREADY_B); + mx31_gpio_mux(MUX_CSPI2_MOSI__CSPI2_MOSI); + mx31_gpio_mux(MUX_CSPI2_MISO__CSPI2_MISO); + mx31_gpio_mux(MUX_CSPI2_SS0__CSPI2_SS0_B); + mx31_gpio_mux(MUX_CSPI2_SS1__CSPI2_SS1_B); /* start SPI2 clock */ __REG(CCM_CGR2) = __REG(CCM_CGR2) | (3 << 4); |
