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

[oweals/u-boot.git] / board / freescale / mx53loco / mx53loco.c

diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 18b388eeda00974462e72440206dda769e75409a..156f8b5a3aca81c070cac58baa7746d9d08d2526 100644 (file)
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -34,7 +34,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
-#include <mxc_gpio.h>
+#include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -146,9 +146,9 @@ int board_mmc_getcd(u8 *cd, struct mmc *mmc)
        struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
 
        if (cfg->esdhc_base == MMC_SDHC1_BASE_ADDR)
-               *cd = mxc_gpio_get(77); /*GPIO3_13*/
+               *cd = gpio_get_value(77); /*GPIO3_13*/
        else
-               *cd = mxc_gpio_get(75); /*GPIO3_11*/
+               *cd = gpio_get_value(75); /*GPIO3_11*/
 
        return 0;
 }
@@ -288,7 +288,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-       gd->bd->bi_arch_number = MACH_TYPE_MX53_LOCO;
        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
        return 0;