mx51evk: Use GPIO API for configuring the IOMUX

[platform/kernel/u-boot.git] / board / freescale / mx51evk / mx51evk.c

diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 73ca513..afb1c30 100644 (file)
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -254,16 +254,14 @@ static void power_init(void)
        pmic_reg_write(p, REG_MODE_1, val);
        udelay(200);
 
-       gpio_direction_output(46, 0);
-
-       /* Reset the ethernet controller over GPIO */
-       writel(0x1, IOMUXC_BASE_ADDR + 0x0AC);
-
        /* Enable VGEN3, VCAM, VAUDIO, VVIDEO, VSD regulators */
        val = VGEN3EN | VGEN3CONFIG | VCAMEN | VCAMCONFIG |
                VVIDEOEN | VAUDIOEN  | VSDEN;
        pmic_reg_write(p, REG_MODE_1, val);
 
+       mxc_request_iomux(MX51_PIN_EIM_A20, IOMUX_CONFIG_ALT1);
+       gpio_direction_output(46, 0);
+
        udelay(500);
 
        gpio_set_value(46, 1);
@@ -414,7 +412,7 @@ int board_init(void)
        return 0;
 }
 
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
 #ifdef CONFIG_MXC_SPI