diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-08 15:49:50 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-08 15:59:41 -0400 |
commit | f5e73a34eddea4fb7c5e3d984b86f395996a64cd (patch) | |
tree | 1854f2e0d2dae343f85870f2a62ae35bdd335a85 /board/grinn/liteboard/board.c | |
parent | e5aee22e4be75e75a854ab64503fc80598bc2004 (diff) | |
parent | 5053da2e4aa297d888cdfc7d216d935504a9472a (diff) |
Merge tag 'mmc-6-23' of https://github.com/MrVan/u-boot
- Pull in the series to split fsl_esdhc for i.MX/non-i.MX cleanly
Diffstat (limited to 'board/grinn/liteboard/board.c')
-rw-r--r-- | board/grinn/liteboard/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c index 80910e4713..1491b8c3d4 100644 --- a/board/grinn/liteboard/board.c +++ b/board/grinn/liteboard/board.c @@ -17,7 +17,7 @@ #include <asm/mach-imx/boot_mode.h> #include <asm/io.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <linux/sizes.h> #include <linux/fb.h> #include <miiphy.h> @@ -66,7 +66,7 @@ static void setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg sd_cfg = {USDHC1_BASE_ADDR, 0, 4}; #define SD_CD_GPIO IMX_GPIO_NR(1, 19) |