i.MX31: Fix IOMUX related typos

Correct the names of some IOMUX macros.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>

diff --git a/board/imx31_litekit/imx31_litekit.c b/board/imx31_litekit/imx31_litekit.c
index 263dd9f7d1ae7ebba5d39a9d6c816937759c6799..8cbc26ed11c886b186bb0b2b53e6f9234243a057 100644 (file)
--- a/board/imx31_litekit/imx31_litekit.c
+++ b/board/imx31_litekit/imx31_litekit.c
@@ -50,7 +50,7 @@ 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);

diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c
index 42ecb1e088d8a7ffe606b04a1b4952131a189970..ae93444a16368f95aed533add1dcb828e9842ed4 100644 (file)
--- 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 */

diff --git a/board/mx31ads/mx31ads.c b/board/mx31ads/mx31ads.c
index dd0e150e92a7d0a1b2d94b7bb2018af47eae451d..b6928fc241f71168c8aeffd75598eb993d9634da 100644 (file)
--- a/board/mx31ads/mx31ads.c
+++ b/board/mx31ads/mx31ads.c
@@ -55,7 +55,7 @@ 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);

diff --git a/include/asm-arm/arch-mx31/mx31-regs.h b/include/asm-arm/arch-mx31/mx31-regs.h
index 02b7dcbcb4ac72eafb96afe4aa20761799df2f54..abe61f09f3e8f3d044d554603318d452e378b841 100644 (file)
--- a/include/asm-arm/arch-mx31/mx31-regs.h
+++ b/include/asm-arm/arch-mx31/mx31-regs.h
@@ -133,10 +133,10 @@
 #define MUX_RXD1__UART1_RXD_MUX        ((MUX_CTL_FUNC << 8) | MUX_CTL_RXD1)
 #define MUX_TXD1__UART1_TXD_MUX        ((MUX_CTL_FUNC << 8) | MUX_CTL_TXD1)
 #define MUX_RTS1__UART1_RTS_B  ((MUX_CTL_FUNC << 8) | MUX_CTL_RTS1)
-#define MUX_RTS1__UART1_CTS_B  ((MUX_CTL_FUNC << 8) | MUX_CTL_CTS1)
+#define MUX_CTS1__UART1_CTS_B  ((MUX_CTL_FUNC << 8) | MUX_CTL_CTS1)
 
 #define MUX_CSPI2_MOSI__I2C2_SCL ((MUX_CTL_ALT1 << 8) | MUX_CTL_CSPI2_MOSI)
-#define MUX_CSPI2_MISO__I2C2_SCL ((MUX_CTL_ALT1 << 8) | MUX_CTL_CSPI2_MISO)
+#define MUX_CSPI2_MISO__I2C2_SDA ((MUX_CTL_ALT1 << 8) | MUX_CTL_CSPI2_MISO)
 
 /*
  * Memory regions and CS