random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 05:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mmc-6-23' of https://github.com/MrVan/u-boot

Browse Source 
- Pull in the series to split fsl_esdhc for i.MX/non-i.MX cleanly
This commit is contained in:
Tom Rini 2019-07-08 15:49:50 -04:00
commit f5e73a34ed
256 changed files with 2297 additions and 982 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/cpu/arm1136/mx35/generic.c
View File

@ -14,8 +14,8 @@
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#endif #endif
#include <netdev.h> #include <netdev.h>
#include <spl.h> #include <spl.h>
@ -27,7 +27,7 @@
#define CCM_GET_DIVIDER(x, m, o) (((x) & (m)) >> (o)) #define CCM_GET_DIVIDER(x, m, o) (((x) & (m)) >> (o))
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#endif #endif
@ -446,7 +446,7 @@ int cpu_eth_init(bd_t *bis)
return rc; return rc;
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
/* /*
* Initializes on-chip MMC controllers. * Initializes on-chip MMC controllers.
* to override, implement board_mmc_init() * to override, implement board_mmc_init()
@ -459,7 +459,7 @@ int cpu_mmc_init(bd_t *bis)
int get_clocks(void) int get_clocks(void)
{ {
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#if CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC2_BASE_ADDR #if CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC2_BASE_ADDR
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
#elif CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC3_BASE_ADDR #elif CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC3_BASE_ADDR

8
arch/arm/cpu/arm926ejs/mx25/generic.c
View File

@ -16,8 +16,8 @@
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#endif #endif
@ -233,7 +233,7 @@ int cpu_eth_init(bd_t *bis)
int get_clocks(void) int get_clocks(void)
{ {
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#if CONFIG_SYS_FSL_ESDHC_ADDR == IMX_MMC_SDHC2_BASE #if CONFIG_SYS_FSL_ESDHC_ADDR == IMX_MMC_SDHC2_BASE
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
#else #else
@ -243,7 +243,7 @@ int get_clocks(void)
return 0; return 0;
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
/* /*
* Initializes on-chip MMC controllers. * Initializes on-chip MMC controllers.
* to override, implement board_mmc_init() * to override, implement board_mmc_init()

10
arch/arm/cpu/armv7/vf610/generic.c
View File

@ -10,11 +10,11 @@
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/mach-imx/sys_proto.h> #include <asm/mach-imx/sys_proto.h>
#include <netdev.h> #include <netdev.h>
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#endif #endif
@ -345,7 +345,7 @@ int cpu_eth_init(bd_t *bis)
return rc; return rc;
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
int cpu_mmc_init(bd_t *bis) int cpu_mmc_init(bd_t *bis)
{ {
return fsl_esdhc_mmc_init(bis); return fsl_esdhc_mmc_init(bis);
@ -354,7 +354,7 @@ int cpu_mmc_init(bd_t *bis)
int get_clocks(void) int get_clocks(void)
{ {
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
#endif #endif
return 0; return 0;

2
arch/arm/cpu/armv8/s32v234/generic.c
View File

@ -342,7 +342,7 @@ int cpu_eth_init(bd_t * bis)
int get_clocks(void) int get_clocks(void)
{ {
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
gd->arch.sdhc_clk = mxc_get_clock(MXC_USDHC_CLK); gd->arch.sdhc_clk = mxc_get_clock(MXC_USDHC_CLK);
#endif #endif
return 0; return 0;

2
arch/arm/include/asm/global_data.h
View File

@ -9,7 +9,7 @@
/* Architecture-specific global data */ /* Architecture-specific global data */
struct arch_global_data { struct arch_global_data {
#if defined(CONFIG_FSL_ESDHC) #if defined(CONFIG_FSL_ESDHC) || defined(CONFIG_FSL_ESDHC_IMX)
u32 sdhc_clk; u32 sdhc_clk;
#endif #endif

6
arch/arm/mach-imx/cpu.c
View File

@ -21,8 +21,8 @@
#include <thermal.h> #include <thermal.h>
#include <sata.h> #include <sata.h>
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#endif #endif
static u32 reset_cause = -1; static u32 reset_cause = -1;
@ -258,7 +258,7 @@ int cpu_eth_init(bd_t *bis)
return rc; return rc;
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
/* /*
* Initializes on-chip MMC controllers. * Initializes on-chip MMC controllers.
* to override, implement board_mmc_init() * to override, implement board_mmc_init()

4
arch/arm/mach-imx/mx6/litesom.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/io.h> #include <asm/io.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <mmc.h> #include <mmc.h>
@ -49,7 +49,7 @@ static iomux_v3_cfg_t const emmc_pads[] = {
MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL), MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
}; };
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static struct fsl_esdhc_cfg emmc_cfg = {USDHC2_BASE_ADDR, 0, 8}; static struct fsl_esdhc_cfg emmc_cfg = {USDHC2_BASE_ADDR, 0, 8};
#define EMMC_PWR_GPIO IMX_GPIO_NR(4, 10) #define EMMC_PWR_GPIO IMX_GPIO_NR(4, 10)

4
arch/arm/mach-imx/mx7/clock.c
View File

@ -19,13 +19,13 @@ struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)
ANATOP_BASE_ADDR; ANATOP_BASE_ADDR;
struct mxc_ccm_reg *ccm_reg = (struct mxc_ccm_reg *)CCM_BASE_ADDR; struct mxc_ccm_reg *ccm_reg = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#endif #endif
int get_clocks(void) int get_clocks(void)
{ {
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR #if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC3_BASE_ADDR #elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC3_BASE_ADDR

2
arch/arm/mach-imx/mx7ulp/clock.c
View File

@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;
int get_clocks(void) int get_clocks(void)
{ {
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC0_RBASE #if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC0_RBASE
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC1_RBASE #elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC1_RBASE

4
arch/arm/mach-imx/speed.c
View File

@ -11,13 +11,13 @@
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#endif #endif
int get_clocks(void) int get_clocks(void)
{ {
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#ifdef CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC
#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR #if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);

2
arch/m68k/cpu/mcf5445x/cpu_init.c
View File

@ -200,7 +200,7 @@ void cpu_init_f(void)
/* Lowest slew rate for UART0,1,2 */ /* Lowest slew rate for UART0,1,2 */
out_8(&gpio->srcr_uart, 0x00); out_8(&gpio->srcr_uart, 0x00);
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
/* eSDHC pin as faster speed */ /* eSDHC pin as faster speed */
out_8(&gpio->srcr_sdhc, 0x03); out_8(&gpio->srcr_sdhc, 0x03);

4
board/advantech/dms-ba16/dms-ba16.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>
@ -221,7 +221,7 @@ static void setup_iomux_uart(void)
imx_iomux_v3_setup_multiple_pads(uart4_pads, ARRAY_SIZE(uart4_pads)); imx_iomux_v3_setup_multiple_pads(uart4_pads, ARRAY_SIZE(uart4_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg usdhc_cfg[3] = { struct fsl_esdhc_cfg usdhc_cfg[3] = {
{USDHC2_BASE_ADDR}, {USDHC2_BASE_ADDR},
{USDHC3_BASE_ADDR}, {USDHC3_BASE_ADDR},

2
board/aristainetos/aristainetos-v1.c
View File

@ -20,7 +20,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>

2
board/aristainetos/aristainetos-v2.c
View File

@ -20,7 +20,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>

4
board/aristainetos/aristainetos.c
View File

@ -20,7 +20,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>
@ -107,7 +107,7 @@ int dram_init(void)
return 0; return 0;
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg usdhc_cfg[2] = { struct fsl_esdhc_cfg usdhc_cfg[2] = {
{USDHC1_BASE_ADDR}, {USDHC1_BASE_ADDR},
{USDHC2_BASE_ADDR}, {USDHC2_BASE_ADDR},

2
board/bachmann/ot1200/ot1200.c
View File

@ -18,7 +18,7 @@
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <netdev.h> #include <netdev.h>
#include <i2c.h> #include <i2c.h>
#include <pca953x.h> #include <pca953x.h>

2
board/barco/platinum/platinum.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/io.h> #include <asm/io.h>

4
board/barco/titanium/titanium.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <micrel.h> #include <micrel.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
@ -215,7 +215,7 @@ int board_ehci_hcd_init(int port)
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg usdhc_cfg[1] = { struct fsl_esdhc_cfg usdhc_cfg[1] = {
{ USDHC3_BASE_ADDR }, { USDHC3_BASE_ADDR },
}; };

4
board/boundary/nitrogen6x/nitrogen6x.c
View File

@ -21,7 +21,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <micrel.h> #include <micrel.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
@ -283,7 +283,7 @@ int board_ehci_power(int port, int on)
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static struct fsl_esdhc_cfg usdhc_cfg[2] = { static struct fsl_esdhc_cfg usdhc_cfg[2] = {
{USDHC3_BASE_ADDR}, {USDHC3_BASE_ADDR},
{USDHC4_BASE_ADDR}, {USDHC4_BASE_ADDR},

2
board/ccv/xpress/xpress.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/io.h> #include <asm/io.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <miiphy.h> #include <miiphy.h>
#include <mmc.h> #include <mmc.h>

6
board/compulab/cl-som-imx7/cl-som-imx7.c
View File

@ -12,7 +12,7 @@
#include <mmc.h> #include <mmc.h>
#include <phy.h> #include <phy.h>
#include <netdev.h> #include <netdev.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <power/pfuze3000_pmic.h> #include <power/pfuze3000_pmic.h>
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
@ -68,7 +68,7 @@ int dram_init(void)
return 0; return 0;
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#define CL_SOM_IMX7_GPIO_USDHC3_PWR IMX_GPIO_NR(6, 11) #define CL_SOM_IMX7_GPIO_USDHC3_PWR IMX_GPIO_NR(6, 11)
@ -116,7 +116,7 @@ int board_mmc_init(bd_t *bis)
return 0; return 0;
} }
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
#ifdef CONFIG_FEC_MXC #ifdef CONFIG_FEC_MXC

6
board/compulab/cl-som-imx7/common.c
View File

@ -8,7 +8,7 @@
*/ */
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
#include "common.h" #include "common.h"
@ -23,7 +23,7 @@ int board_spi_cs_gpio(unsigned int bus, unsigned int cs)
#endif /* CONFIG_SPI */ #endif /* CONFIG_SPI */
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
int board_mmc_getcd(struct mmc *mmc) int board_mmc_getcd(struct mmc *mmc)
{ {
@ -42,4 +42,4 @@ int board_mmc_getcd(struct mmc *mmc)
return ret; return ret;
} }
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */

8
board/compulab/cl-som-imx7/common.h
View File

@ -9,19 +9,19 @@
#define PADS_SET_PROT(pads_array) void cl_som_imx7_##pads_array##_set(void) #define PADS_SET_PROT(pads_array) void cl_som_imx7_##pads_array##_set(void)
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#define CL_SOM_IMX7_GPIO_USDHC1_CD IMX_GPIO_NR(5, 0) #define CL_SOM_IMX7_GPIO_USDHC1_CD IMX_GPIO_NR(5, 0)
PADS_SET_PROT(usdhc1_pads); PADS_SET_PROT(usdhc1_pads);
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
PADS_SET_PROT(uart1_pads); PADS_SET_PROT(uart1_pads);
#ifdef CONFIG_SPI #ifdef CONFIG_SPI
PADS_SET_PROT(espi1_pads); PADS_SET_PROT(espi1_pads);
#endif /* CONFIG_SPI */ #endif /* CONFIG_SPI */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
PADS_SET_PROT(usdhc3_emmc_pads); PADS_SET_PROT(usdhc3_emmc_pads);
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
#ifdef CONFIG_FEC_MXC #ifdef CONFIG_FEC_MXC
PADS_SET_PROT(phy1_rst_pads); PADS_SET_PROT(phy1_rst_pads);
PADS_SET_PROT(fec1_pads); PADS_SET_PROT(fec1_pads);

8
board/compulab/cl-som-imx7/mux.c
View File

@ -17,7 +17,7 @@ void cl_som_imx7_##pads_array##_set(void) \
imx_iomux_v3_setup_multiple_pads(pads_array, ARRAY_SIZE(pads_array)); \ imx_iomux_v3_setup_multiple_pads(pads_array, ARRAY_SIZE(pads_array)); \
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \ #define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | \ PAD_CTL_HYS | PAD_CTL_PUE | \
@ -36,7 +36,7 @@ static iomux_v3_cfg_t const usdhc1_pads[] = {
PADS_SET(usdhc1_pads) PADS_SET(usdhc1_pads)
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \ #define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \
PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS) PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
@ -69,7 +69,7 @@ PADS_SET(espi1_pads)
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static iomux_v3_cfg_t const usdhc3_emmc_pads[] = { static iomux_v3_cfg_t const usdhc3_emmc_pads[] = {
MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@ -89,7 +89,7 @@ static iomux_v3_cfg_t const usdhc3_emmc_pads[] = {
PADS_SET(usdhc3_emmc_pads) PADS_SET(usdhc3_emmc_pads)
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
#ifdef CONFIG_FEC_MXC #ifdef CONFIG_FEC_MXC

6
board/compulab/cl-som-imx7/spl.c
View File

@ -9,14 +9,14 @@
#include <common.h> #include <common.h>
#include <spl.h> #include <spl.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/arch-mx7/mx7-pins.h> #include <asm/arch-mx7/mx7-pins.h>
#include <asm/arch-mx7/clock.h> #include <asm/arch-mx7/clock.h>
#include <asm/arch-mx7/mx7-ddr.h> #include <asm/arch-mx7/mx7-ddr.h>
#include "common.h" #include "common.h"
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static struct fsl_esdhc_cfg cl_som_imx7_spl_usdhc_cfg = { static struct fsl_esdhc_cfg cl_som_imx7_spl_usdhc_cfg = {
USDHC1_BASE_ADDR, 0, 4}; USDHC1_BASE_ADDR, 0, 4};
@ -27,7 +27,7 @@ int board_mmc_init(bd_t *bis)
cl_som_imx7_spl_usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); cl_som_imx7_spl_usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
return fsl_esdhc_initialize(bis, &cl_som_imx7_spl_usdhc_cfg); return fsl_esdhc_initialize(bis, &cl_som_imx7_spl_usdhc_cfg);
} }
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
static iomux_v3_cfg_t const led_pads[] = { static iomux_v3_cfg_t const led_pads[] = {
MX7D_PAD_SAI1_TX_SYNC__GPIO6_IO14 | MUX_PAD_CTRL(PAD_CTL_PUS_PU5KOHM | MX7D_PAD_SAI1_TX_SYNC__GPIO6_IO14 | MUX_PAD_CTRL(PAD_CTL_PUS_PU5KOHM |

4
board/compulab/cm_fx6/cm_fx6.c
View File

@ -12,7 +12,7 @@
#include <dm.h> #include <dm.h>
#include <dwc_ahsata.h> #include <dwc_ahsata.h>
#include <environment.h> #include <environment.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <mtd_node.h> #include <mtd_node.h>
#include <netdev.h> #include <netdev.h>
@ -608,7 +608,7 @@ int board_init(void)
cm_fx6_setup_display(); cm_fx6_setup_display();
/* This should be done in the MMC driver when MX6 has a clock driver */ /* This should be done in the MMC driver when MX6 has a clock driver */
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
if (IS_ENABLED(CONFIG_BLK)) { if (IS_ENABLED(CONFIG_BLK)) {
int i; int i;

4
board/compulab/cm_fx6/common.c
View File

@ -11,10 +11,10 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/mach-imx/spi.h> #include <asm/mach-imx/spi.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include "common.h" #include "common.h"
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ #define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \
PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \
PAD_CTL_SRE_FAST | PAD_CTL_HYS) PAD_CTL_SRE_FAST | PAD_CTL_HYS)

2
board/compulab/cm_fx6/spl.c
View File

@ -16,7 +16,7 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include "common.h" #include "common.h"
enum ddr_config { enum ddr_config {

4
board/congatec/cgtqmx6eval/cgtqmx6eval.c
View File

@ -21,7 +21,7 @@
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <input.h> #include <input.h>
#include <power/pmic.h> #include <power/pmic.h>
@ -411,7 +411,7 @@ static void setup_spi(void)
} }
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static struct fsl_esdhc_cfg usdhc_cfg[] = { static struct fsl_esdhc_cfg usdhc_cfg[] = {
{USDHC2_BASE_ADDR}, {USDHC2_BASE_ADDR},
{USDHC3_BASE_ADDR}, {USDHC3_BASE_ADDR},

2
board/dhelectronics/dh_imx6/dh_imx6.c
View File

@ -24,7 +24,7 @@
#include <dwc_ahsata.h> #include <dwc_ahsata.h>
#include <environment.h> #include <environment.h>
#include <errno.h> #include <errno.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <fuse.h> #include <fuse.h>
#include <i2c.h> #include <i2c.h>
#include <miiphy.h> #include <miiphy.h>

2
board/dhelectronics/dh_imx6/dh_imx6_spl.c
View File

@ -20,7 +20,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <errno.h> #include <errno.h>
#include <fuse.h> #include <fuse.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <spl.h> #include <spl.h>

4
board/el/el6x/el6x.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>
@ -255,7 +255,7 @@ iomux_v3_cfg_t const usdhc4_pads[] = {
MX6_PAD_SD4_DAT7__SD4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_DAT7__SD4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
}; };
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg usdhc_cfg[2] = { struct fsl_esdhc_cfg usdhc_cfg[2] = {
{USDHC2_BASE_ADDR}, {USDHC2_BASE_ADDR},
{USDHC4_BASE_ADDR}, {USDHC4_BASE_ADDR},

4
board/embest/mx6boards/mx6boards.c
View File

@ -27,7 +27,7 @@
#include <i2c.h> #include <i2c.h>
#include <input.h> #include <input.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>
@ -181,7 +181,7 @@ iomux_v3_cfg_t const usdhc4_pads[] = {
MX6_PAD_NANDF_ALE__GPIO6_IO08 | MUX_PAD_CTRL(NO_PAD_CTRL), MX6_PAD_NANDF_ALE__GPIO6_IO08 | MUX_PAD_CTRL(NO_PAD_CTRL),
}; };
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg usdhc_cfg[3] = { struct fsl_esdhc_cfg usdhc_cfg[3] = {
{USDHC2_BASE_ADDR}, {USDHC2_BASE_ADDR},
{USDHC3_BASE_ADDR}, {USDHC3_BASE_ADDR},

2
board/freescale/imx8mq_evk/imx8mq_evk.c
View File

@ -11,7 +11,7 @@
#include <netdev.h> #include <netdev.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <mmc.h> #include <mmc.h>
#include <asm/arch/imx8mq_pins.h> #include <asm/arch/imx8mq_pins.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>

2
board/freescale/imx8mq_evk/spl.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/gpio.h> #include <asm/mach-imx/gpio.h>
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <mmc.h> #include <mmc.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <power/pfuze100_pmic.h> #include <power/pfuze100_pmic.h>

2
board/freescale/imx8qxp_mek/imx8qxp_mek.c
View File

@ -7,7 +7,7 @@
#include <errno.h> #include <errno.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <environment.h> #include <environment.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>

2
board/freescale/m54418twr/m54418twr.c
View File

@ -9,7 +9,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

6
board/freescale/mx25pdk/mx25pdk.c
View File

@ -12,7 +12,7 @@
#include <asm/arch/iomux-mx25.h> #include <asm/arch/iomux-mx25.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <fsl_pmic.h> #include <fsl_pmic.h>
@ -24,7 +24,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[1] = { struct fsl_esdhc_cfg esdhc_cfg[1] = {
{IMX_MMC_SDHC1_BASE}, {IMX_MMC_SDHC1_BASE},
}; };
@ -151,7 +151,7 @@ int board_late_init(void)
return 0; return 0;
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
int board_mmc_getcd(struct mmc *mmc) int board_mmc_getcd(struct mmc *mmc)
{ {
/* Set up the Card Detect pin. */ /* Set up the Card Detect pin. */

4
board/freescale/mx35pdk/mx35pdk.c
View File

@ -16,7 +16,7 @@
#include <power/pmic.h> #include <power/pmic.h>
#include <fsl_pmic.h> #include <fsl_pmic.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <mc9sdz60.h> #include <mc9sdz60.h>
#include <mc13892.h> #include <mc13892.h>
#include <linux/types.h> #include <linux/types.h>
@ -261,7 +261,7 @@ int board_eth_init(bd_t *bis)
return cpu_eth_init(bis); return cpu_eth_init(bis);
} }
#if defined(CONFIG_FSL_ESDHC) #if defined(CONFIG_FSL_ESDHC_IMX)
struct fsl_esdhc_cfg esdhc_cfg = {MMC_SDHC1_BASE_ADDR}; struct fsl_esdhc_cfg esdhc_cfg = {MMC_SDHC1_BASE_ADDR};

6
board/freescale/mx51evk/mx51evk.c
View File

@ -16,7 +16,7 @@
#include <i2c.h> #include <i2c.h>
#include <input.h> #include <input.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <fsl_pmic.h> #include <fsl_pmic.h>
#include <mc13892.h> #include <mc13892.h>
@ -24,7 +24,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[2] = { struct fsl_esdhc_cfg esdhc_cfg[2] = {
{MMC_SDHC1_BASE_ADDR}, {MMC_SDHC1_BASE_ADDR},
{MMC_SDHC2_BASE_ADDR}, {MMC_SDHC2_BASE_ADDR},
@ -262,7 +262,7 @@ static void power_init(void)
gpio_set_value(IMX_GPIO_NR(2, 14), 1); gpio_set_value(IMX_GPIO_NR(2, 14), 1);
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
int board_mmc_getcd(struct mmc *mmc) int board_mmc_getcd(struct mmc *mmc)
{ {
struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;

4
board/freescale/mx53ard/mx53ard.c
View File

@ -13,7 +13,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <netdev.h> #include <netdev.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#define ETHERNET_INT IMX_GPIO_NR(2, 31) #define ETHERNET_INT IMX_GPIO_NR(2, 31)
@ -112,7 +112,7 @@ static void setup_iomux_uart(void)
imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[2] = { struct fsl_esdhc_cfg esdhc_cfg[2] = {
{MMC_SDHC1_BASE_ADDR}, {MMC_SDHC1_BASE_ADDR},
{MMC_SDHC2_BASE_ADDR}, {MMC_SDHC2_BASE_ADDR},

4
board/freescale/mx53evk/mx53evk.c
View File

@ -15,7 +15,7 @@
#include <netdev.h> #include <netdev.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <fsl_pmic.h> #include <fsl_pmic.h>
#include <asm/gpio.h> #include <asm/gpio.h>
@ -137,7 +137,7 @@ static void setup_iomux_fec(void)
imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads)); imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[2] = { struct fsl_esdhc_cfg esdhc_cfg[2] = {
{MMC_SDHC1_BASE_ADDR}, {MMC_SDHC1_BASE_ADDR},
{MMC_SDHC3_BASE_ADDR}, {MMC_SDHC3_BASE_ADDR},

4
board/freescale/mx53loco/mx53loco.c
View File

@ -18,7 +18,7 @@
#include <i2c.h> #include <i2c.h>
#include <input.h> #include <input.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <dialog_pmic.h> #include <dialog_pmic.h>
@ -92,7 +92,7 @@ static void setup_iomux_fec(void)
imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads)); imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[2] = { struct fsl_esdhc_cfg esdhc_cfg[2] = {
{MMC_SDHC1_BASE_ADDR}, {MMC_SDHC1_BASE_ADDR},
{MMC_SDHC3_BASE_ADDR}, {MMC_SDHC3_BASE_ADDR},

4
board/freescale/mx53smd/mx53smd.c
View File

@ -13,7 +13,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <netdev.h> #include <netdev.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/gpio.h> #include <asm/gpio.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -77,7 +77,7 @@ static void setup_iomux_fec(void)
imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads)); imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[1] = { struct fsl_esdhc_cfg esdhc_cfg[1] = {
{MMC_SDHC1_BASE_ADDR}, {MMC_SDHC1_BASE_ADDR},
}; };

4
board/freescale/mx6qarm2/mx6qarm2.c
View File

@ -12,7 +12,7 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <usb.h> #include <usb.h>
@ -103,7 +103,7 @@ static void setup_iomux_enet(void)
imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads)); imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg usdhc_cfg[2] = { struct fsl_esdhc_cfg usdhc_cfg[2] = {
{USDHC3_BASE_ADDR}, {USDHC3_BASE_ADDR},
{USDHC4_BASE_ADDR}, {USDHC4_BASE_ADDR},

4
board/freescale/mx6sabreauto/mx6sabreauto.c
View File

@ -18,7 +18,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/spi.h> #include <asm/mach-imx/spi.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
@ -282,7 +282,7 @@ static void setup_iomux_uart(void)
SETUP_IOMUX_PADS(uart4_pads); SETUP_IOMUX_PADS(uart4_pads);
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static struct fsl_esdhc_cfg usdhc_cfg[1] = { static struct fsl_esdhc_cfg usdhc_cfg[1] = {
{USDHC3_BASE_ADDR}, {USDHC3_BASE_ADDR},
}; };

4
board/freescale/mx6sabresd/mx6sabresd.c
View File

@ -17,7 +17,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>
@ -250,7 +250,7 @@ static void setup_iomux_uart(void)
SETUP_IOMUX_PADS(uart1_pads); SETUP_IOMUX_PADS(uart1_pads);
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg usdhc_cfg[3] = { struct fsl_esdhc_cfg usdhc_cfg[3] = {
{USDHC2_BASE_ADDR}, {USDHC2_BASE_ADDR},
{USDHC3_BASE_ADDR}, {USDHC3_BASE_ADDR},

2
board/freescale/mx6slevk/mx6slevk.c
View File

@ -19,7 +19,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <netdev.h> #include <netdev.h>

2
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
View File

@ -17,7 +17,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <power/pmic.h> #include <power/pmic.h>

2
board/freescale/mx6sxsabresd/mx6sxsabresd.c
View File

@ -17,7 +17,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <mmc.h> #include <mmc.h>
#include <i2c.h> #include <i2c.h>
#include <miiphy.h> #include <miiphy.h>

4
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/io.h> #include <asm/io.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <miiphy.h> #include <miiphy.h>
#include <linux/sizes.h> #include <linux/sizes.h>
@ -189,7 +189,7 @@ static int board_qspi_init(void)
} }
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static struct fsl_esdhc_cfg usdhc_cfg[2] = { static struct fsl_esdhc_cfg usdhc_cfg[2] = {
{USDHC1_BASE_ADDR, 0, 4}, {USDHC1_BASE_ADDR, 0, 4},
#if defined(CONFIG_MX6UL_14X14_EVK_EMMC_REWORK) #if defined(CONFIG_MX6UL_14X14_EVK_EMMC_REWORK)

2
board/freescale/mx6ullevk/mx6ullevk.c
View File

@ -14,7 +14,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/io.h> #include <asm/io.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <mmc.h> #include <mmc.h>

2
board/freescale/mx7dsabresd/mx7dsabresd.c
View File

@ -12,7 +12,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <mmc.h> #include <mmc.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>

4
board/freescale/s32v234evb/s32v234evb.c
View File

@ -10,7 +10,7 @@
#include <asm/arch/lpddr2.h> #include <asm/arch/lpddr2.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <i2c.h> #include <i2c.h>
@ -74,7 +74,7 @@ void setup_iomux_nfc(void)
} }
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[1] = { struct fsl_esdhc_cfg esdhc_cfg[1] = {
{USDHC_BASE_ADDR}, {USDHC_BASE_ADDR},
}; };

4
board/freescale/vf610twr/vf610twr.c
View File

@ -11,7 +11,7 @@
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <i2c.h> #include <i2c.h>
@ -234,7 +234,7 @@ static void setup_iomux_qspi(void)
imx_iomux_v3_setup_multiple_pads(qspi0_pads, ARRAY_SIZE(qspi0_pads)); imx_iomux_v3_setup_multiple_pads(qspi0_pads, ARRAY_SIZE(qspi0_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[1] = { struct fsl_esdhc_cfg esdhc_cfg[1] = {
{ESDHC1_BASE_ADDR}, {ESDHC1_BASE_ADDR},
}; };

6
board/gateworks/gw_ventana/common.c
View File

@ -10,7 +10,7 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <hwconfig.h> #include <hwconfig.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <power/ltc3676_pmic.h> #include <power/ltc3676_pmic.h>
@ -1656,7 +1656,7 @@ void setup_pmic(void)
} }
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static struct fsl_esdhc_cfg usdhc_cfg[2]; static struct fsl_esdhc_cfg usdhc_cfg[2];
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
@ -1753,4 +1753,4 @@ int board_mmc_getcd(struct mmc *mmc)
return -1; return -1;
} }
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */

2
board/gateworks/gw_ventana/gw_ventana.c
View File

@ -25,7 +25,7 @@
#include <hwconfig.h> #include <hwconfig.h>
#include <i2c.h> #include <i2c.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <jffs2/load_kernel.h> #include <jffs2/load_kernel.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <miiphy.h> #include <miiphy.h>

2
board/ge/bx50v3/bx50v3.c
View File

@ -17,7 +17,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <net.h> #include <net.h>
#include <netdev.h> #include <netdev.h>

2
board/ge/mx53ppd/mx53ppd.c
View File

@ -24,7 +24,7 @@
#include <netdev.h> #include <netdev.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <dialog_pmic.h> #include <dialog_pmic.h>

4
board/grinn/liteboard/board.c
View File

@ -17,7 +17,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/io.h> #include <asm/io.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <miiphy.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)); 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}; static struct fsl_esdhc_cfg sd_cfg = {USDHC1_BASE_ADDR, 0, 4};
#define SD_CD_GPIO IMX_GPIO_NR(1, 19) #define SD_CD_GPIO IMX_GPIO_NR(1, 19)

2
board/inversepath/usbarmory/usbarmory.c
View File

@ -17,7 +17,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/gpio.h> #include <asm/gpio.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

4
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
View File

@ -18,7 +18,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <errno.h> #include <errno.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <fuse.h> #include <fuse.h>
#include <i2c.h> #include <i2c.h>
#include <miiphy.h> #include <miiphy.h>
@ -166,7 +166,7 @@ int board_phy_config(struct phy_device *phydev)
} }
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#define USDHC2_CD_GPIO IMX_GPIO_NR(1, 4) #define USDHC2_CD_GPIO IMX_GPIO_NR(1, 4)
static struct fsl_esdhc_cfg usdhc_cfg[] = { static struct fsl_esdhc_cfg usdhc_cfg[] = {

2
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
View File

@ -20,7 +20,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <errno.h> #include <errno.h>
#include <fuse.h> #include <fuse.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <spl.h> #include <spl.h>

2
board/kosagi/novena/novena.c
View File

@ -25,7 +25,7 @@
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <dwc_ahsata.h> #include <dwc_ahsata.h>
#include <environment.h> #include <environment.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <input.h> #include <input.h>
#include <ipu_pixfmt.h> #include <ipu_pixfmt.h>

6
board/kosagi/novena/novena_spl.c
View File

@ -19,7 +19,7 @@
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <spl.h> #include <spl.h>
#include <asm/arch/mx6-ddr.h> #include <asm/arch/mx6-ddr.h>
@ -404,7 +404,7 @@ static inline void novena_spl_setup_iomux_video(void) {}
/* /*
* SPL boots from uSDHC card * SPL boots from uSDHC card
*/ */
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
static struct fsl_esdhc_cfg usdhc_cfg = { static struct fsl_esdhc_cfg usdhc_cfg = {
USDHC3_BASE_ADDR, 0, 4 USDHC3_BASE_ADDR, 0, 4
}; };
@ -566,7 +566,7 @@ void board_init_f(ulong dummy)
#ifdef CONFIG_BOARD_POSTCLK_INIT #ifdef CONFIG_BOARD_POSTCLK_INIT
board_postclk_init(); board_postclk_init();
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
get_clocks(); get_clocks();
#endif #endif

2
board/liebherr/display5/common.c
View File

@ -89,7 +89,7 @@ void displ5_set_iomux_ecspi_spl(void) {}
void displ5_set_iomux_ecspi(void) {} void displ5_set_iomux_ecspi(void) {}
#endif #endif
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
iomux_v3_cfg_t const usdhc4_pads[] = { iomux_v3_cfg_t const usdhc4_pads[] = {
MX6_PAD_SD4_CLK__SD4_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_CLK__SD4_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_SD4_CMD__SD4_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_CMD__SD4_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),

6
board/liebherr/display5/display5.c
View File

@ -21,7 +21,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/spi.h> #include <asm/mach-imx/spi.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <i2c.h> #include <i2c.h>
@ -186,7 +186,7 @@ iomux_v3_cfg_t const misc_pads[] = {
MX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL), MX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),
}; };
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg usdhc_cfg[1] = { struct fsl_esdhc_cfg usdhc_cfg[1] = {
{ USDHC4_BASE_ADDR, 0, 8, }, { USDHC4_BASE_ADDR, 0, 8, },
}; };
@ -204,7 +204,7 @@ int board_mmc_init(bd_t *bis)
return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
} }
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
static void displ5_setup_ecspi(void) static void displ5_setup_ecspi(void)
{ {

2
board/liebherr/display5/spl.c
View File

@ -18,7 +18,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <environment.h> #include <environment.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <netdev.h> #include <netdev.h>
#include <bootcount.h> #include <bootcount.h>
#include <watchdog.h> #include <watchdog.h>

2
board/liebherr/mccmon6/mccmon6.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/spi.h> #include <asm/mach-imx/spi.h>
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/io.h> #include <asm/io.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <mmc.h> #include <mmc.h>
#include <netdev.h> #include <netdev.h>
#include <micrel.h> #include <micrel.h>

2
board/liebherr/mccmon6/spl.c
View File

@ -14,7 +14,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>

4
board/logicpd/imx6/imx6logic.c
View File

@ -12,7 +12,7 @@
#include <miiphy.h> #include <miiphy.h>
#include <input.h> #include <input.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <linux/sizes.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 */ 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[] = { struct fsl_esdhc_cfg usdhc_cfg[] = {
{USDHC1_BASE_ADDR}, /* SOM */ {USDHC1_BASE_ADDR}, /* SOM */
{USDHC2_BASE_ADDR} /* Baseboard */ {USDHC2_BASE_ADDR} /* Baseboard */

39
board/menlo/m53menlo/m53menlo.c
View File

@ -19,7 +19,7 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/spl.h> #include <asm/spl.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <ipu_pixfmt.h> #include <ipu_pixfmt.h>
#include <linux/errno.h> #include <linux/errno.h>
@ -125,6 +125,43 @@ static void setup_iomux_fec(void)
imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads)); imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));
} }
#ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg = {
MMC_SDHC1_BASE_ADDR,
};
int board_mmc_getcd(struct mmc *mmc)
{
imx_iomux_v3_setup_pad(MX53_PAD_GPIO_1__GPIO1_1);
gpio_direction_input(IMX_GPIO_NR(1, 1));
return !gpio_get_value(IMX_GPIO_NR(1, 1));
}
#define SD_CMD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_DSE_HIGH | \
PAD_CTL_PUS_100K_UP)
#define SD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \
PAD_CTL_DSE_HIGH)
int board_mmc_init(bd_t *bis)
{
static const iomux_v3_cfg_t sd1_pads[] = {
NEW_PAD_CTRL(MX53_PAD_SD1_CMD__ESDHC1_CMD, SD_CMD_PAD_CTRL),
NEW_PAD_CTRL(MX53_PAD_SD1_CLK__ESDHC1_CLK, SD_PAD_CTRL),
NEW_PAD_CTRL(MX53_PAD_SD1_DATA0__ESDHC1_DAT0, SD_PAD_CTRL),
NEW_PAD_CTRL(MX53_PAD_SD1_DATA1__ESDHC1_DAT1, SD_PAD_CTRL),
NEW_PAD_CTRL(MX53_PAD_SD1_DATA2__ESDHC1_DAT2, SD_PAD_CTRL),
NEW_PAD_CTRL(MX53_PAD_SD1_DATA3__ESDHC1_DAT3, SD_PAD_CTRL),
};
esdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
imx_iomux_v3_setup_multiple_pads(sd1_pads, ARRAY_SIZE(sd1_pads));
return fsl_esdhc_initialize(bis, &esdhc_cfg);
}
#endif
static void enable_lvds_clock(struct display_info_t const *dev, const u8 hclk) static void enable_lvds_clock(struct display_info_t const *dev, const u8 hclk)
{ {
static struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE; static struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;

2
board/phytec/pcl063/pcl063.c
View File

@ -12,7 +12,7 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>

6
board/phytec/pcl063/spl.c
View File

@ -14,7 +14,7 @@
#include <asm/arch/mx6-pins.h> #include <asm/arch/mx6-pins.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
/* Configuration for Micron MT41K256M16TW-107 IT:P, 32M x 16 x 8 -> 256MiB */ /* Configuration for Micron MT41K256M16TW-107 IT:P, 32M x 16 x 8 -> 256MiB */
@ -101,7 +101,7 @@ static void spl_dram_init(void)
mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr); mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ #define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \
@ -205,7 +205,7 @@ void board_boot_order(u32 *spl_boot_list)
spl_boot_list[0] = boot_dev; spl_boot_list[0] = boot_dev;
} }
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
void board_init_f(ulong dummy) void board_init_f(ulong dummy)
{ {

2
board/phytec/pcm058/pcm058.c
View File

@ -25,7 +25,7 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <mmc.h> #include <mmc.h>
#include <i2c.h> #include <i2c.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <nand.h> #include <nand.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>

2
board/phytec/pfla02/pfla02.c
View File

@ -19,7 +19,7 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <mmc.h> #include <mmc.h>
#include <i2c.h> #include <i2c.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <nand.h> #include <nand.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>

2
board/seco/common/mx6.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>

2
board/seco/mx6quq7/mx6quq7.c
View File

@ -17,7 +17,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <malloc.h> #include <malloc.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>

2
board/sks-kinkel/sksimx6/sksimx6.c
View File

@ -12,7 +12,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>

2
board/softing/vining_2000/vining_2000.c
View File

@ -19,7 +19,7 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <common.h> #include <common.h>
#include <environment.h> #include <environment.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <mmc.h> #include <mmc.h>
#include <i2c.h> #include <i2c.h>
#include <miiphy.h> #include <miiphy.h>

2
board/solidrun/mx6cuboxi/mx6cuboxi.c
View File

@ -24,7 +24,7 @@
#include <asm/mach-imx/sata.h> #include <asm/mach-imx/sata.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <malloc.h> #include <malloc.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>

6
board/tbs/tbs2910/tbs2910.c
View File

@ -13,7 +13,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/mxc_hdmi.h> #include <asm/arch/mxc_hdmi.h>
@ -98,7 +98,7 @@ static void setup_iomux_uart(void)
imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads)); imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
/* set environment device to boot device when booting from SD */ /* set environment device to boot device when booting from SD */
int board_mmc_get_env_dev(int devno) int board_mmc_get_env_dev(int devno)
{ {
@ -109,7 +109,7 @@ int board_mmc_get_env_part(int devno)
{ {
return (devno == 3) ? 1 : 0; /* part 0 for SD2 / SD3, part 1 for eMMC */ return (devno == 3) ? 1 : 0; /* part 0 for SD2 / SD3, part 1 for eMMC */
} }
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC_IMX */
#ifdef CONFIG_VIDEO_IPUV3 #ifdef CONFIG_VIDEO_IPUV3
static void do_enable_hdmi(struct display_info_t const *dev) static void do_enable_hdmi(struct display_info_t const *dev)

2
board/technexion/pico-imx6ul/spl.c
View File

@ -10,7 +10,7 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <spl.h> #include <spl.h>

2
board/technexion/pico-imx7d/spl.c
View File

@ -13,7 +13,7 @@
#include <asm/arch-mx7/mx7-ddr.h> #include <asm/arch-mx7/mx7-ddr.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <spl.h> #include <spl.h>
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_SPL_BUILD)

6
board/technologic/ts4800/ts4800.c
View File

@ -19,7 +19,7 @@
#include <environment.h> #include <environment.h>
#include <mmc.h> #include <mmc.h>
#include <input.h> #include <input.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <mc13892.h> #include <mc13892.h>
#include <malloc.h> #include <malloc.h>
@ -29,7 +29,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
struct fsl_esdhc_cfg esdhc_cfg[2] = { struct fsl_esdhc_cfg esdhc_cfg[2] = {
{MMC_SDHC1_BASE_ADDR}, {MMC_SDHC1_BASE_ADDR},
{MMC_SDHC2_BASE_ADDR}, {MMC_SDHC2_BASE_ADDR},
@ -96,7 +96,7 @@ static void setup_iomux_fec(void)
imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads)); imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC_IMX
int board_mmc_getcd(struct mmc *mmc) int board_mmc_getcd(struct mmc *mmc)
{ {
struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;

6
board/toradex/apalis_imx6/apalis_imx6.c
View File

@ -27,7 +27,7 @@
#include <dm/platform_data/serial_mxc.h> #include <dm/platform_data/serial_mxc.h>
#include <dwc_ahsata.h> #include <dwc_ahsata.h>
#include <environment.h> #include <environment.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <imx_thermal.h> #include <imx_thermal.h>
#include <micrel.h> #include <micrel.h>
#include <miiphy.h> #include <miiphy.h>
@ -131,7 +131,7 @@ iomux_v3_cfg_t const usdhc3_pads[] = {
MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL),
MX6_PAD_SD3_RST__GPIO7_IO08 | MUX_PAD_CTRL(WEAK_PULLUP) | MUX_MODE_SION, MX6_PAD_SD3_RST__GPIO7_IO08 | MUX_PAD_CTRL(WEAK_PULLUP) | MUX_MODE_SION,
}; };
#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ #endif /* CONFIG_FSL_ESDHC_IMX & CONFIG_SPL_BUILD */
int mx6_rgmii_rework(struct phy_device *phydev) int mx6_rgmii_rework(struct phy_device *phydev)
{ {
@ -355,7 +355,7 @@ int board_mmc_init(bd_t *bis)
return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
} }
#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ #endif /* CONFIG_FSL_ESDHC_IMX & CONFIG_SPL_BUILD */
int board_phy_config(struct phy_device *phydev) int board_phy_config(struct phy_device *phydev)
{ {

6
board/toradex/colibri_imx6/colibri_imx6.c
View File

@ -25,7 +25,7 @@
#include <cpu.h> #include <cpu.h>
#include <dm/platform_data/serial_mxc.h> #include <dm/platform_data/serial_mxc.h>
#include <environment.h> #include <environment.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <imx_thermal.h> #include <imx_thermal.h>
#include <micrel.h> #include <micrel.h>
#include <miiphy.h> #include <miiphy.h>
@ -110,7 +110,7 @@ iomux_v3_cfg_t const usdhc3_pads[] = {
MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL), MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_EMMC_PAD_CTRL),
MX6_PAD_SD3_RST__SD3_RESET | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD3_RST__SD3_RESET | MUX_PAD_CTRL(USDHC_PAD_CTRL),
}; };
#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ #endif /* CONFIG_FSL_ESDHC_IMX & CONFIG_SPL_BUILD */
iomux_v3_cfg_t const enet_pads[] = { iomux_v3_cfg_t const enet_pads[] = {
MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
@ -361,7 +361,7 @@ int board_mmc_init(bd_t *bis)
return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
} }
#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ #endif /* CONFIG_FSL_ESDHC_IMX & CONFIG_SPL_BUILD */
int board_phy_config(struct phy_device *phydev) int board_phy_config(struct phy_device *phydev)
{ {

2
board/toradex/colibri_imx7/colibri_imx7.c
View File

@ -15,7 +15,7 @@
#include <dm.h> #include <dm.h>
#include <dm/platform_data/serial_mxc.h> #include <dm/platform_data/serial_mxc.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <jffs2/load_kernel.h> #include <jffs2/load_kernel.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <mmc.h> #include <mmc.h>

2
board/tqc/tqma6/tqma6.c
View File

@ -18,7 +18,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/mach-imx/spi.h> #include <asm/mach-imx/spi.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>

2
board/tqc/tqma6/tqma6_mba6.c
View File

@ -18,7 +18,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <malloc.h> #include <malloc.h>
#include <i2c.h> #include <i2c.h>

2
board/tqc/tqma6/tqma6_wru4.c
View File

@ -21,7 +21,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <common.h> #include <common.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <malloc.h> #include <malloc.h>
#include <i2c.h> #include <i2c.h>

2
board/udoo/neo/neo.c
View File

@ -16,7 +16,7 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>

2
board/udoo/udoo.c
View File

@ -15,7 +15,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/sata.h> #include <asm/mach-imx/sata.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>

2
board/udoo/udoo_spl.c
View File

@ -15,7 +15,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>

2
board/variscite/dart_6ul/dart_6ul.c
View File

@ -10,7 +10,7 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <miiphy.h> #include <miiphy.h>
#include <netdev.h> #include <netdev.h>

2
board/variscite/dart_6ul/spl.c
View File

@ -11,7 +11,7 @@
#include <asm/arch/mx6-ddr.h> #include <asm/arch/mx6-ddr.h>
#include <asm/arch/mx6-pins.h> #include <asm/arch/mx6-pins.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ #define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \

2
board/wandboard/spl.c
View File

@ -14,7 +14,7 @@
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/video.h> #include <asm/mach-imx/video.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>

2
board/warp/warp.c
View File

@ -19,7 +19,7 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <common.h> #include <common.h>
#include <watchdog.h> #include <watchdog.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <usb.h> #include <usb.h>

4
board/woodburn/woodburn.c
View File

@ -17,7 +17,7 @@
#include <fsl_pmic.h> #include <fsl_pmic.h>
#include <mc13892.h> #include <mc13892.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc_imx.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
@ -206,7 +206,7 @@ int board_init(void)
return 0; return 0;
} }
#if defined(CONFIG_FSL_ESDHC) #if defined(CONFIG_FSL_ESDHC_IMX)
struct fsl_esdhc_cfg esdhc_cfg = {MMC_SDHC1_BASE_ADDR}; struct fsl_esdhc_cfg esdhc_cfg = {MMC_SDHC1_BASE_ADDR};
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)

1
configs/apalis-imx8qm_defconfig
View File

@ -35,6 +35,7 @@ CONFIG_DM_I2C=y
CONFIG_SYS_I2C_IMX_LPI2C=y CONFIG_SYS_I2C_IMX_LPI2C=y
CONFIG_MISC=y CONFIG_MISC=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_FSL_ESDHC_IMX=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ADDR_ENABLE=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y

Some files were not shown because too many files have changed in this diff Show More