diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-08 22:49:50 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-08 22:59:41 +0300 |
commit | f5e73a34eddea4fb7c5e3d984b86f395996a64cd (patch) | |
tree | 1854f2e0d2dae343f85870f2a62ae35bdd335a85 /board/logicpd/imx6/imx6logic.c | |
parent | e5aee22e4be75e75a854ab64503fc80598bc2004 (diff) | |
parent | 5053da2e4aa297d888cdfc7d216d935504a9472a (diff) | |
download | u-boot-f5e73a34eddea4fb7c5e3d984b86f395996a64cd.tar.xz |
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/logicpd/imx6/imx6logic.c')
-rw-r--r-- | board/logicpd/imx6/imx6logic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index 53e609e15c..e48b3beb16 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -12,7 +12,7 @@ #include <miiphy.h> #include <input.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/io.h> #include <asm/gpio.h> #include <linux/sizes.h> @@ -200,7 +200,7 @@ static iomux_v3_cfg_t const usdhc2_pads[] = { MX6_PAD_GPIO_4__GPIO1_IO04 | MUX_PAD_CTRL(NO_PAD_CTRL), /* CD */ }; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[] = { {USDHC1_BASE_ADDR}, /* SOM */ {USDHC2_BASE_ADDR} /* Baseboard */ |