diff options
Diffstat (limited to 'board/davinci/da8xxevm/omapl138_lcdk.c')
-rw-r--r-- | board/davinci/da8xxevm/omapl138_lcdk.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 9c1a483..4a34c1a 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -20,7 +20,7 @@ #include <asm/io.h> #include <linux/errno.h> #include <asm/arch/davinci_misc.h> -#ifdef CONFIG_DAVINCI_MMC +#ifdef CONFIG_MMC_DAVINCI #include <mmc.h> #include <asm/arch/sdmmc_defs.h> #endif @@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR; #define pinmux(x) (&davinci_syscfg_regs->pinmux[x]) -#ifdef CONFIG_DAVINCI_MMC +#ifdef CONFIG_MMC_DAVINCI /* MMC0 pin muxer settings */ const struct pinmux_config mmc0_pins[] = { /* GP0[11] is required for SD to work on Rev 3 EVMs */ @@ -130,7 +130,7 @@ const struct lpsc_resource lpsc[] = { { DAVINCI_LPSC_EMAC }, /* image download */ { DAVINCI_LPSC_UART2 }, /* console */ { DAVINCI_LPSC_GPIO }, -#ifdef CONFIG_DAVINCI_MMC +#ifdef CONFIG_MMC_DAVINCI { DAVINCI_LPSC_MMC_SD }, #endif }; @@ -175,9 +175,6 @@ int board_init(void) irq_init(); #endif - /* arch number of the board */ - gd->bd->bi_arch_number = MACH_TYPE_OMAPL138_LCDK; - /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; @@ -210,7 +207,7 @@ int board_init(void) #endif -#ifdef CONFIG_DAVINCI_MMC +#ifdef CONFIG_MMC_DAVINCI if (davinci_configure_pin_mux(mmc0_pins, ARRAY_SIZE(mmc0_pins)) != 0) return 1; #endif @@ -355,7 +352,7 @@ int misc_init_r(void) return 0; } -#ifdef CONFIG_DAVINCI_MMC +#ifdef CONFIG_MMC_DAVINCI static struct davinci_mmc mmc_sd0 = { .reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE, .host_caps = MMC_MODE_4BIT, /* DA850 supports only 4-bit SD/MMC */ |