Split fsl_esdhc driver for i.MX
Subsystems (5)
v6 cover Split fsl_esdhc driver for i.MX
The fsl_esdhc driver was for Freescale eSDHC on MPC83XX/MPC85XX initially. The later QoriQ series PowerPC processors (which were evolutions of MPC83XX/MPC85XX), QorIQ series ARM processors, and i.MX series processors were using this driver for their eSDHCs too.
For the two series processors, the eSDHCs are becoming more and more different. We should have split it into two drivers, like them (sdhci-of-esdhc.c/sdhci-esdhc-imx.c) in linux kernel.
It's ideal to keep common part for reusing. However, it's hard to find out a little which could be reused. The truth is there will be more and more different registers, bits and operatiing processes. Even some code is common now, it may have to be split in the future. So let's just split is as two drivers.
Patch #2 just created a fsl_esdhc_imx driver which was a copy of fsl_esdhc driver for i.MX processors.
Patch #3 converted i.MX platforms to use fsl_esdhc_imx. Patch #4 and #5 just dropped useless code for the two driver. There are still many cleaning up works needed to be done in the future, because the eSDHC driver is mess for a long time.
Since I'm only owner for QorIQ eSDHC driver, I dropped only a little things which I'm sure for fsl_esdhc_imx. Let i.MX eSDHC owner do futhur cleaning up.
---
Changes for v6:
- Rebased.
- Applied to two new i.MX boards phycore_pcl063_ull/pico-imx7d_bl33.
Yangbo Lu (5):
Move CONFIG_FSL_ESDHC to defconfig
mmc: split fsl_esdhc driver for i.MX
Convert to use fsl_esdhc_imx for i.MX platforms
mmc: fsl_esdhc: drop i.MX code
mmc: fsl_esdhc_imx: drop useless code
arch/arm/cpu/arm1136/mx35/generic.c | 10 +-
arch/arm/cpu/arm926ejs/mx25/generic.c | 8 +-
arch/arm/cpu/armv7/vf610/generic.c | 10 +-
arch/arm/cpu/armv8/s32v234/generic.c | 2 +-
arch/arm/include/asm/global_data.h | 2 +-
arch/arm/mach-imx/cpu.c | 6 +-
arch/arm/mach-imx/mx6/litesom.c | 4 +-
arch/arm/mach-imx/mx7/clock.c | 4 +-
arch/arm/mach-imx/mx7ulp/clock.c | 2 +-
arch/arm/mach-imx/speed.c | 4 +-
arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +-
board/advantech/dms-ba16/dms-ba16.c | 4 +-
board/aristainetos/aristainetos-v1.c | 2 +-
board/aristainetos/aristainetos-v2.c | 2 +-
board/aristainetos/aristainetos.c | 4 +-
board/bachmann/ot1200/ot1200.c | 2 +-
board/barco/platinum/platinum.c | 2 +-
board/barco/titanium/titanium.c | 4 +-
board/boundary/nitrogen6x/nitrogen6x.c | 4 +-
board/ccv/xpress/xpress.c | 2 +-
board/compulab/cl-som-imx7/cl-som-imx7.c | 6 +-
board/compulab/cl-som-imx7/common.c | 6 +-
board/compulab/cl-som-imx7/common.h | 8 +-
board/compulab/cl-som-imx7/mux.c | 8 +-
board/compulab/cl-som-imx7/spl.c | 6 +-
board/compulab/cm_fx6/cm_fx6.c | 4 +-
board/compulab/cm_fx6/common.c | 4 +-
board/compulab/cm_fx6/spl.c | 2 +-
board/congatec/cgtqmx6eval/cgtqmx6eval.c | 4 +-
board/dhelectronics/dh_imx6/dh_imx6.c | 2 +-
board/dhelectronics/dh_imx6/dh_imx6_spl.c | 2 +-
board/el/el6x/el6x.c | 4 +-
board/embest/mx6boards/mx6boards.c | 4 +-
board/freescale/imx8mq_evk/imx8mq_evk.c | 2 +-
board/freescale/imx8mq_evk/spl.c | 2 +-
board/freescale/imx8qxp_mek/imx8qxp_mek.c | 2 +-
board/freescale/m54418twr/m54418twr.c | 2 +-
board/freescale/mx25pdk/mx25pdk.c | 6 +-
board/freescale/mx35pdk/mx35pdk.c | 4 +-
board/freescale/mx51evk/mx51evk.c | 6 +-
board/freescale/mx53ard/mx53ard.c | 4 +-
board/freescale/mx53evk/mx53evk.c | 4 +-
board/freescale/mx53loco/mx53loco.c | 4 +-
board/freescale/mx53smd/mx53smd.c | 4 +-
board/freescale/mx6qarm2/mx6qarm2.c | 4 +-
board/freescale/mx6sabreauto/mx6sabreauto.c | 4 +-
board/freescale/mx6sabresd/mx6sabresd.c | 4 +-
board/freescale/mx6slevk/mx6slevk.c | 2 +-
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +-
board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +-
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 4 +-
board/freescale/mx6ullevk/mx6ullevk.c | 2 +-
board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +-
board/freescale/s32v234evb/s32v234evb.c | 4 +-
board/freescale/vf610twr/vf610twr.c | 4 +-
board/gateworks/gw_ventana/common.c | 6 +-
board/gateworks/gw_ventana/gw_ventana.c | 2 +-
board/ge/bx50v3/bx50v3.c | 2 +-
board/ge/mx53ppd/mx53ppd.c | 2 +-
board/grinn/liteboard/board.c | 4 +-
board/inversepath/usbarmory/usbarmory.c | 2 +-
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 4 +-
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 2 +-
board/kosagi/novena/novena.c | 2 +-
board/kosagi/novena/novena_spl.c | 6 +-
board/liebherr/display5/common.c | 2 +-
board/liebherr/display5/display5.c | 6 +-
board/liebherr/display5/spl.c | 2 +-
board/liebherr/mccmon6/mccmon6.c | 2 +-
board/liebherr/mccmon6/spl.c | 2 +-
board/logicpd/imx6/imx6logic.c | 4 +-
board/menlo/m53menlo/m53menlo.c | 4 +-
board/phytec/pcl063/pcl063.c | 2 +-
board/phytec/pcl063/spl.c | 6 +-
board/phytec/pcm058/pcm058.c | 2 +-
board/phytec/pfla02/pfla02.c | 2 +-
board/seco/common/mx6.c | 2 +-
board/seco/mx6quq7/mx6quq7.c | 2 +-
board/sks-kinkel/sksimx6/sksimx6.c | 2 +-
board/softing/vining_2000/vining_2000.c | 2 +-
board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +-
board/tbs/tbs2910/tbs2910.c | 6 +-
board/technexion/pico-imx6ul/spl.c | 2 +-
board/technexion/pico-imx7d/spl.c | 2 +-
board/technologic/ts4800/ts4800.c | 6 +-
board/toradex/apalis_imx6/apalis_imx6.c | 6 +-
board/toradex/colibri_imx6/colibri_imx6.c | 6 +-
board/toradex/colibri_imx7/colibri_imx7.c | 2 +-
board/tqc/tqma6/tqma6.c | 2 +-
board/tqc/tqma6/tqma6_mba6.c | 2 +-
board/tqc/tqma6/tqma6_wru4.c | 2 +-
board/udoo/neo/neo.c | 2 +-
board/udoo/udoo.c | 2 +-
board/udoo/udoo_spl.c | 2 +-
board/variscite/dart_6ul/dart_6ul.c | 2 +-
board/variscite/dart_6ul/spl.c | 2 +-
board/wandboard/spl.c | 2 +-
board/warp/warp.c | 2 +-
board/woodburn/woodburn.c | 4 +-
configs/apalis_imx6_defconfig | 2 +-
configs/aristainetos2_defconfig | 2 +-
configs/aristainetos2b_defconfig | 2 +-
configs/aristainetos_defconfig | 2 +-
configs/bk4r1_defconfig | 2 +-
configs/cgtqmx6eval_defconfig | 2 +-
configs/cl-som-imx7_defconfig | 2 +-
configs/cm_fx6_defconfig | 2 +-
configs/colibri-imx6ull_defconfig | 2 +-
configs/colibri_imx6_defconfig | 2 +-
configs/colibri_imx7_defconfig | 2 +-
configs/colibri_imx7_emmc_defconfig | 2 +-
configs/colibri_vf_defconfig | 2 +-
configs/dh_imx6_defconfig | 2 +-
configs/display5_defconfig | 2 +-
configs/display5_factory_defconfig | 2 +-
configs/dms-ba16-1g_defconfig | 2 +-
configs/dms-ba16_defconfig | 2 +-
configs/ge_bx50v3_defconfig | 2 +-
configs/gwventana_emmc_defconfig | 2 +-
configs/gwventana_gw5904_defconfig | 2 +-
configs/gwventana_nand_defconfig | 2 +-
configs/imx6dl_icore_nand_defconfig | 2 +-
configs/imx6dl_mamoj_defconfig | 2 +-
configs/imx6q_icore_nand_defconfig | 2 +-
configs/imx6q_logic_defconfig | 2 +-
configs/imx6qdl_icore_mipi_defconfig | 2 +-
configs/imx6qdl_icore_mmc_defconfig | 2 +-
configs/imx6qdl_icore_nand_defconfig | 2 +-
configs/imx6qdl_icore_rqs_defconfig | 2 +-
configs/imx6ul_geam_mmc_defconfig | 2 +-
configs/imx6ul_geam_nand_defconfig | 2 +-
configs/imx6ul_isiot_emmc_defconfig | 2 +-
configs/imx6ul_isiot_nand_defconfig | 2 +-
configs/imx8mq_evk_defconfig | 1 +
configs/imx8qm_mek_defconfig | 1 +
configs/imx8qxp_mek_defconfig | 1 +
configs/kp_imx53_defconfig | 2 +-
configs/kp_imx6q_tpc_defconfig | 1 +
configs/liteboard_defconfig | 2 +-
configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 +
configs/ls1012afrwy_qspi_defconfig | 1 +
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 +
configs/ls1012afrwy_tfa_defconfig | 1 +
configs/m53menlo_defconfig | 2 +-
configs/marsboard_defconfig | 2 +-
configs/mccmon6_nor_defconfig | 2 +-
configs/mccmon6_sd_defconfig | 2 +-
configs/mx25pdk_defconfig | 2 +-
configs/mx35pdk_defconfig | 2 +-
configs/mx51evk_defconfig | 2 +-
configs/mx53ard_defconfig | 2 +-
configs/mx53cx9020_defconfig | 2 +-
configs/mx53evk_defconfig | 2 +-
configs/mx53loco_defconfig | 2 +-
configs/mx53ppd_defconfig | 2 +-
configs/mx53smd_defconfig | 2 +-
configs/mx6cuboxi_defconfig | 2 +-
configs/mx6dlarm2_defconfig | 2 +-
configs/mx6dlarm2_lpddr2_defconfig | 2 +-
configs/mx6qarm2_defconfig | 2 +-
configs/mx6qarm2_lpddr2_defconfig | 2 +-
configs/mx6qsabrelite_defconfig | 2 +-
configs/mx6sabreauto_defconfig | 2 +-
configs/mx6sabresd_defconfig | 2 +-
configs/mx6slevk_defconfig | 2 +-
configs/mx6slevk_spinor_defconfig | 2 +-
configs/mx6slevk_spl_defconfig | 2 +-
configs/mx6sllevk_defconfig | 2 +-
configs/mx6sllevk_plugin_defconfig | 2 +-
configs/mx6sxsabreauto_defconfig | 2 +-
configs/mx6sxsabresd_defconfig | 2 +-
configs/mx6sxsabresd_spl_defconfig | 2 +-
configs/mx6ul_14x14_evk_defconfig | 2 +-
configs/mx6ul_9x9_evk_defconfig | 2 +-
configs/mx6ull_14x14_evk_defconfig | 2 +-
configs/mx6ull_14x14_evk_plugin_defconfig | 2 +-
configs/mx7dsabresd_defconfig | 2 +-
configs/mx7dsabresd_qspi_defconfig | 2 +-
configs/mx7ulp_evk_defconfig | 2 +-
configs/mx7ulp_evk_plugin_defconfig | 2 +-
configs/nitrogen6dl2g_defconfig | 2 +-
configs/nitrogen6dl_defconfig | 2 +-
configs/nitrogen6q2g_defconfig | 2 +-
configs/nitrogen6q_defconfig | 2 +-
configs/nitrogen6s1g_defconfig | 2 +-
configs/nitrogen6s_defconfig | 2 +-
configs/novena_defconfig | 2 +-
configs/opos6uldev_defconfig | 2 +-
configs/ot1200_defconfig | 2 +-
configs/ot1200_spl_defconfig | 2 +-
configs/pcm052_defconfig | 2 +-
configs/pcm058_defconfig | 2 +-
configs/pfla02_defconfig | 2 +-
configs/phycore_pcl063_defconfig | 2 +-
configs/phycore_pcl063_ull_defconfig | 2 +-
configs/pico-hobbit-imx6ul_defconfig | 2 +-
configs/pico-hobbit-imx7d_defconfig | 2 +-
configs/pico-imx6ul_defconfig | 2 +-
configs/pico-imx7d_bl33_defconfig | 2 +-
configs/pico-imx7d_defconfig | 2 +-
configs/pico-pi-imx6ul_defconfig | 2 +-
configs/pico-pi-imx7d_defconfig | 2 +-
configs/platinum_picon_defconfig | 2 +-
configs/platinum_titanium_defconfig | 2 +-
configs/riotboard_defconfig | 2 +-
configs/riotboard_spl_defconfig | 2 +-
configs/s32v234evb_defconfig | 2 +-
configs/secomx6quq7_defconfig | 2 +-
configs/sksimx6_defconfig | 2 +-
configs/tbs2910_defconfig | 2 +-
configs/titanium_defconfig | 2 +-
configs/tqma6dl_mba6_mmc_defconfig | 2 +-
configs/tqma6dl_mba6_spi_defconfig | 2 +-
configs/tqma6q_mba6_mmc_defconfig | 2 +-
configs/tqma6q_mba6_spi_defconfig | 2 +-
configs/tqma6s_mba6_mmc_defconfig | 2 +-
configs/tqma6s_mba6_spi_defconfig | 2 +-
configs/tqma6s_wru4_mmc_defconfig | 2 +-
configs/ts4800_defconfig | 2 +-
configs/udoo_defconfig | 2 +-
configs/udoo_neo_defconfig | 2 +-
configs/usbarmory_defconfig | 2 +-
configs/variscite_dart6ul_defconfig | 2 +-
configs/vf610twr_defconfig | 2 +-
configs/vf610twr_nand_defconfig | 2 +-
configs/vining_2000_defconfig | 2 +-
configs/wandboard_defconfig | 2 +-
configs/warp7_bl33_defconfig | 2 +-
configs/warp7_defconfig | 2 +-
configs/warp_defconfig | 2 +-
configs/woodburn_defconfig | 2 +-
configs/woodburn_sd_defconfig | 2 +-
configs/xpress_defconfig | 2 +-
configs/xpress_spl_defconfig | 2 +-
configs/zc5202_defconfig | 2 +-
configs/zc5601_defconfig | 2 +-
drivers/mmc/Kconfig | 10 +-
drivers/mmc/Makefile | 1 +
drivers/mmc/fsl_esdhc.c | 626 +---------------------
drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} | 72 +--
include/configs/imx8mq_evk.h | 1 -
include/configs/imx8qm_mek.h | 1 -
include/configs/imx8qxp_mek.h | 1 -
include/configs/kp_imx6q_tpc.h | 1 -
include/configs/ls1012afrwy.h | 1 -
include/fsl_esdhc.h | 57 --
include/{fsl_esdhc.h => fsl_esdhc_imx.h} | 17 +-
247 files changed, 351 insertions(+), 1047 deletions(-)
copy drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} (95%)
copy include/{fsl_esdhc.h => fsl_esdhc_imx.h} (97%)Signature · 1 line
2.7.4
PATCH v6 1/5 Move CONFIG_FSL_ESDHC to defconfig
Moved CONFIG_FSL_ESDHC from header files to defconfig files.
---
Changes for v2:
- Rebased.
Changes for v3:
- Rebased.
Changes for v4:
- Added Tested-by/Reviewed-by/Acked-by.
Changes for v5:
- None.
Changes for v6:
- None.
--- configs/imx8mq_evk_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/kp_imx6q_tpc_defconfig | 1 + configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_qspi_defconfig | 1 + configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_tfa_defconfig | 1 + include/configs/imx8mq_evk.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/kp_imx6q_tpc.h | 1 - include/configs/ls1012afrwy.h | 1 - 13 files changed, 8 insertions(+), 5 deletions(-)
configs/imx8mq_evk_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_DM_ETH=y CONFIG_PINCTRL=y
configs/imx8qm_mek_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y
configs/imx8qxp_mek_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y
configs/kp_imx6q_tpc_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y CONFIG_FEC_MXC=y
configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y
configs/ls1012afrwy_qspi_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y
configs/ls1012afrwy_tfa_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y
include/configs/imx8mq_evk.h +0 -1
@@ -216,7 +216,6 @@#define CONFIG_IMX_BOOTAUX #define CONFIG_CMD_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2
include/configs/imx8qm_mek.h +0 -1
@@ -47,7 +47,6 @@#undef CONFIG_CMD_CRC32#undef CONFIG_BOOTM_NETBSD -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define USDHC1_BASE_ADDR 0x5B010000
include/configs/imx8qxp_mek.h +0 -1
@@ -46,7 +46,6 @@#undef CONFIG_CMD_CRC32#undef CONFIG_BOOTM_NETBSD -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define USDHC1_BASE_ADDR 0x5B010000
include/configs/kp_imx6q_tpc.h +0 -1
@@ -39,7 +39,6 @@#define CONFIG_SYS_I2C_SPEED 100000/* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_USDHC_NUM 2
include/configs/ls1012afrwy.h +0 -1
@@ -41,7 +41,6 @@/* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif
Signature · 1 line
2.7.4
PATCH v6 2/5 mmc: split fsl_esdhc driver for i.MX
In reply to Yangbo LuThe fsl_esdhc driver was for Freescale eSDHC on MPC83XX/MPC85XX initially. The later QoriQ series PowerPC processors (which were evolutions of MPC83XX/MPC85XX), QorIQ series ARM processors, and i.MX series processors were using this driver for their eSDHCs too.
For the two series processors, the eSDHCs are becoming more and more different. We should have split it into two drivers, like them (sdhci-of-esdhc.c/sdhci-esdhc-imx.c) in linux kernel.
This patch is just to create a fsl_esdhc_imx driver which is a copy of fsl_esdhc driver for i.MX processors. We will convert i.MX processors to use fsl_esdhc_imx, and clean up the two drivers separately in the future patches.
---
Changes for v2:
- None.
Changes for v3:
- None.
Changes for v4:
- Used "Enhanced Secure Digital Host" in Kconfig help.
- Moved copyright to top line and added my info.
- Added Tested-by/Reviewed-by.
Changes for v5:
- None.
Changes for v6:
- None.
---
drivers/mmc/Kconfig | 10 ++++++++--
drivers/mmc/Makefile | 1 +
drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} | 7 +++++--
include/{fsl_esdhc.h => fsl_esdhc_imx.h} | 13 ++++++++-----
4 files changed, 22 insertions(+), 9 deletions(-)
copy drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} (99%)
copy include/{fsl_esdhc.h => fsl_esdhc_imx.h} (97%)drivers/mmc/Kconfig +8 -2
@@ -668,8 +668,14 @@ config TEGRA124_MMC_DISABLE_EXT_LOOPBACK config FSL_ESDHC bool "Freescale/NXP eSDHC controller support" help - This selects support for the eSDHC (enhanced secure digital host - controller) found on numerous Freescale/NXP SoCs. + This selects support for the eSDHC (Enhanced Secure Digital Host + Controller) found on numerous Freescale/NXP SoCs. + +config FSL_ESDHC_IMX + bool "Freescale/NXP i.MX eSDHC controller support" + help + This selects support for the i.MX eSDHC (Enhanced Secure Digital Host + Controller) found on numerous Freescale/NXP SoCs. endmenu
drivers/mmc/Makefile +1 -0
@@ -26,6 +26,7 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) += rockchip_dw_mmc.o obj-$(CONFIG_MMC_DW_SOCFPGA) += socfpga_dw_mmc.o obj-$(CONFIG_MMC_DW_SNPS) += snps_dw_mmc.o obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o +obj-$(CONFIG_FSL_ESDHC_IMX) += fsl_esdhc_imx.o obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o
drivers/mmc/fsl_esdhc_imx.c renamed from drivers/mmc/fsl_esdhc.c +5 -2
@@ -1,5 +1,8 @@// SPDX-License-Identifier: GPL-2.0+ /* +* Copyright 2019 NXP +* Yangbo Lu <[email protected]> +* * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc * Andy Fleming *
@@ -18,7 +21,7 @@#include <part.h> #include <power/regulator.h> #include <malloc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <fdt_support.h> #include <asm/io.h> #include <dm.h>
@@ -110,7 +113,7 @@ struct esdhc_soc_data {* @non_removable: 0: removable; 1: non-removable * @wp_enable: 1: enable checking wp; 0: no check * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V -* @flags: ESDHC_FLAG_xx in include/fsl_esdhc.h +* @flags: ESDHC_FLAG_xx in include/fsl_esdhc_imx.h * @caps: controller capabilities * @tuning_step: tuning step setting in tuning_ctrl register * @start_tuning_tap: the start point for tuning in tuning_ctrl register
include/fsl_esdhc_imx.h renamed from include/fsl_esdhc.h +8 -5
@@ -3,11 +3,14 @@* FSL SD/MMC Defines *------------------------------------------------------------------- * +* Copyright 2019 NXP +* Yangbo Lu <[email protected]> +* * Copyright 2007-2008,2010-2011 Freescale Semiconductor, Inc */ -#ifndef __FSL_ESDHC_H__ -#define __FSL_ESDHC_H__ +#ifndef __FSL_ESDHC_IMX_H__ +#define __FSL_ESDHC_IMX_H__#include <linux/bitops.h> #include <linux/errno.h>
@@ -258,15 +261,15 @@ struct fsl_esdhc_cfg {#error "Endianess is not defined: please fix to continue"#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX int fsl_esdhc_mmc_init (bd_t *bis);int fsl_esdhc_initialize (bd_t *bis,struct fsl_esdhc_cfg *cfg);void fdt_fixup_esdhc (void *blob,bd_t *bd);#else static inline int fsl_esdhc_mmc_init (bd_t *bis) {return -ENOSYS ; }static inline void fdt_fixup_esdhc (void *blob,bd_t *bd) {} -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ void __noreturn mmc_boot (void );void mmc_spl_load_image (uint32_t offs,unsigned int size,void *vdst); -#endif /* __FSL_ESDHC_H__ */ +#endif /* __FSL_ESDHC_IMX_H__ */
Signature · 1 line
2.7.4
PATCH v6 3/5 Convert to use fsl_esdhc_imx for i.MX platforms
In reply to Yangbo LuConverted to use fsl_esdhc_imx for i.MX platforms.
---
Changes for v2:
- Rebased.
Changes for v3:
- Rebased.
Changes for v4:
- Rebased.
- Added Tested-by/Reviewed-by/Acked-by.
Changes for v5:
- Applied to MCF544x platforms.
Changes for v6:
- Rebased.
- Applied to two new i.MX boards phycore_pcl063_ull/pico-imx7d_bl33.
--- arch/arm/cpu/arm1136/mx35/generic.c | 10 +++++----- arch/arm/cpu/arm926ejs/mx25/generic.c | 8 ++++---- arch/arm/cpu/armv7/vf610/generic.c | 10 +++++----- arch/arm/cpu/armv8/s32v234/generic.c | 2 +- arch/arm/include/asm/global_data.h | 2 +- arch/arm/mach-imx/cpu.c | 6 +++--- arch/arm/mach-imx/mx6/litesom.c | 4 ++-- arch/arm/mach-imx/mx7/clock.c | 4 ++-- arch/arm/mach-imx/mx7ulp/clock.c | 2 +- arch/arm/mach-imx/speed.c | 4 ++-- arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +- board/advantech/dms-ba16/dms-ba16.c | 4 ++-- board/aristainetos/aristainetos-v1.c | 2 +- board/aristainetos/aristainetos-v2.c | 2 +- board/aristainetos/aristainetos.c | 4 ++-- board/bachmann/ot1200/ot1200.c | 2 +- board/barco/platinum/platinum.c | 2 +- board/barco/titanium/titanium.c | 4 ++-- board/boundary/nitrogen6x/nitrogen6x.c | 4 ++-- board/ccv/xpress/xpress.c | 2 +- board/compulab/cl-som-imx7/cl-som-imx7.c | 6 +++--- board/compulab/cl-som-imx7/common.c | 6 +++--- board/compulab/cl-som-imx7/common.h | 8 ++++---- board/compulab/cl-som-imx7/mux.c | 8 ++++---- board/compulab/cl-som-imx7/spl.c | 6 +++--- board/compulab/cm_fx6/cm_fx6.c | 4 ++-- board/compulab/cm_fx6/common.c | 4 ++-- board/compulab/cm_fx6/spl.c | 2 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 4 ++-- board/dhelectronics/dh_imx6/dh_imx6.c | 2 +- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 2 +- board/el/el6x/el6x.c | 4 ++-- board/embest/mx6boards/mx6boards.c | 4 ++-- board/freescale/imx8mq_evk/imx8mq_evk.c | 2 +- board/freescale/imx8mq_evk/spl.c | 2 +- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 2 +- board/freescale/m54418twr/m54418twr.c | 2 +- board/freescale/mx25pdk/mx25pdk.c | 6 +++--- board/freescale/mx35pdk/mx35pdk.c | 4 ++-- board/freescale/mx51evk/mx51evk.c | 6 +++--- board/freescale/mx53ard/mx53ard.c | 4 ++-- board/freescale/mx53evk/mx53evk.c | 4 ++-- board/freescale/mx53loco/mx53loco.c | 4 ++-- board/freescale/mx53smd/mx53smd.c | 4 ++-- board/freescale/mx6qarm2/mx6qarm2.c | 4 ++-- board/freescale/mx6sabreauto/mx6sabreauto.c | 4 ++-- board/freescale/mx6sabresd/mx6sabresd.c | 4 ++-- board/freescale/mx6slevk/mx6slevk.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 4 ++-- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +- board/freescale/s32v234evb/s32v234evb.c | 4 ++-- board/freescale/vf610twr/vf610twr.c | 4 ++-- board/gateworks/gw_ventana/common.c | 6 +++--- board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/ge/bx50v3/bx50v3.c | 2 +- board/ge/mx53ppd/mx53ppd.c | 2 +- board/grinn/liteboard/board.c | 4 ++-- board/inversepath/usbarmory/usbarmory.c | 2 +- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 4 ++-- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 2 +- board/kosagi/novena/novena.c | 2 +- board/kosagi/novena/novena_spl.c | 6 +++--- board/liebherr/display5/common.c | 2 +- board/liebherr/display5/display5.c | 6 +++--- board/liebherr/display5/spl.c | 2 +- board/liebherr/mccmon6/mccmon6.c | 2 +- board/liebherr/mccmon6/spl.c | 2 +- board/logicpd/imx6/imx6logic.c | 4 ++-- board/menlo/m53menlo/m53menlo.c | 4 ++-- board/phytec/pcl063/pcl063.c | 2 +- board/phytec/pcl063/spl.c | 6 +++--- board/phytec/pcm058/pcm058.c | 2 +- board/phytec/pfla02/pfla02.c | 2 +- board/seco/common/mx6.c | 2 +- board/seco/mx6quq7/mx6quq7.c | 2 +- board/sks-kinkel/sksimx6/sksimx6.c | 2 +- board/softing/vining_2000/vining_2000.c | 2 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- board/tbs/tbs2910/tbs2910.c | 6 +++--- board/technexion/pico-imx6ul/spl.c | 2 +- board/technexion/pico-imx7d/spl.c | 2 +- board/technologic/ts4800/ts4800.c | 6 +++--- board/toradex/apalis_imx6/apalis_imx6.c | 6 +++--- board/toradex/colibri_imx6/colibri_imx6.c | 6 +++--- board/toradex/colibri_imx7/colibri_imx7.c | 2 +- board/tqc/tqma6/tqma6.c | 2 +- board/tqc/tqma6/tqma6_mba6.c | 2 +- board/tqc/tqma6/tqma6_wru4.c | 2 +- board/udoo/neo/neo.c | 2 +- board/udoo/udoo.c | 2 +- board/udoo/udoo_spl.c | 2 +- board/variscite/dart_6ul/dart_6ul.c | 2 +- board/variscite/dart_6ul/spl.c | 2 +- board/wandboard/spl.c | 2 +- board/warp/warp.c | 2 +- board/woodburn/woodburn.c | 4 ++-- configs/apalis_imx6_defconfig | 2 +- configs/aristainetos2_defconfig | 2 +- configs/aristainetos2b_defconfig | 2 +- configs/aristainetos_defconfig | 2 +- configs/bk4r1_defconfig | 2 +- configs/cgtqmx6eval_defconfig | 2 +- configs/cl-som-imx7_defconfig | 2 +- configs/cm_fx6_defconfig | 2 +- configs/colibri-imx6ull_defconfig | 2 +- configs/colibri_imx6_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- configs/colibri_imx7_emmc_defconfig | 2 +- configs/colibri_vf_defconfig | 2 +- configs/dh_imx6_defconfig | 2 +- configs/display5_defconfig | 2 +- configs/display5_factory_defconfig | 2 +- configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/ge_bx50v3_defconfig | 2 +- configs/gwventana_emmc_defconfig | 2 +- configs/gwventana_gw5904_defconfig | 2 +- configs/gwventana_nand_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6dl_mamoj_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6q_logic_defconfig | 2 +- configs/imx6qdl_icore_mipi_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 2 +- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- configs/imx6ul_isiot_emmc_defconfig | 2 +- configs/imx6ul_isiot_nand_defconfig | 2 +- configs/imx8mq_evk_defconfig | 2 +- configs/imx8qm_mek_defconfig | 2 +- configs/imx8qxp_mek_defconfig | 2 +- configs/kp_imx53_defconfig | 2 +- configs/kp_imx6q_tpc_defconfig | 2 +- configs/liteboard_defconfig | 2 +- configs/m53menlo_defconfig | 2 +- configs/marsboard_defconfig | 2 +- configs/mccmon6_nor_defconfig | 2 +- configs/mccmon6_sd_defconfig | 2 +- configs/mx25pdk_defconfig | 2 +- configs/mx35pdk_defconfig | 2 +- configs/mx51evk_defconfig | 2 +- configs/mx53ard_defconfig | 2 +- configs/mx53cx9020_defconfig | 2 +- configs/mx53evk_defconfig | 2 +- configs/mx53loco_defconfig | 2 +- configs/mx53ppd_defconfig | 2 +- configs/mx53smd_defconfig | 2 +- configs/mx6cuboxi_defconfig | 2 +- configs/mx6dlarm2_defconfig | 2 +- configs/mx6dlarm2_lpddr2_defconfig | 2 +- configs/mx6qarm2_defconfig | 2 +- configs/mx6qarm2_lpddr2_defconfig | 2 +- configs/mx6qsabrelite_defconfig | 2 +- configs/mx6sabreauto_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/mx6slevk_defconfig | 2 +- configs/mx6slevk_spinor_defconfig | 2 +- configs/mx6slevk_spl_defconfig | 2 +- configs/mx6sllevk_defconfig | 2 +- configs/mx6sllevk_plugin_defconfig | 2 +- configs/mx6sxsabreauto_defconfig | 2 +- configs/mx6sxsabresd_defconfig | 2 +- configs/mx6sxsabresd_spl_defconfig | 2 +- configs/mx6ul_14x14_evk_defconfig | 2 +- configs/mx6ul_9x9_evk_defconfig | 2 +- configs/mx6ull_14x14_evk_defconfig | 2 +- configs/mx6ull_14x14_evk_plugin_defconfig | 2 +- configs/mx7dsabresd_defconfig | 2 +- configs/mx7dsabresd_qspi_defconfig | 2 +- configs/mx7ulp_evk_defconfig | 2 +- configs/mx7ulp_evk_plugin_defconfig | 2 +- configs/nitrogen6dl2g_defconfig | 2 +- configs/nitrogen6dl_defconfig | 2 +- configs/nitrogen6q2g_defconfig | 2 +- configs/nitrogen6q_defconfig | 2 +- configs/nitrogen6s1g_defconfig | 2 +- configs/nitrogen6s_defconfig | 2 +- configs/novena_defconfig | 2 +- configs/opos6uldev_defconfig | 2 +- configs/ot1200_defconfig | 2 +- configs/ot1200_spl_defconfig | 2 +- configs/pcm052_defconfig | 2 +- configs/pcm058_defconfig | 2 +- configs/pfla02_defconfig | 2 +- configs/phycore_pcl063_defconfig | 2 +- configs/phycore_pcl063_ull_defconfig | 2 +- configs/pico-hobbit-imx6ul_defconfig | 2 +- configs/pico-hobbit-imx7d_defconfig | 2 +- configs/pico-imx6ul_defconfig | 2 +- configs/pico-imx7d_bl33_defconfig | 2 +- configs/pico-imx7d_defconfig | 2 +- configs/pico-pi-imx6ul_defconfig | 2 +- configs/pico-pi-imx7d_defconfig | 2 +- configs/platinum_picon_defconfig | 2 +- configs/platinum_titanium_defconfig | 2 +- configs/riotboard_defconfig | 2 +- configs/riotboard_spl_defconfig | 2 +- configs/s32v234evb_defconfig | 2 +- configs/secomx6quq7_defconfig | 2 +- configs/sksimx6_defconfig | 2 +- configs/tbs2910_defconfig | 2 +- configs/titanium_defconfig | 2 +- configs/tqma6dl_mba6_mmc_defconfig | 2 +- configs/tqma6dl_mba6_spi_defconfig | 2 +- configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- configs/tqma6s_wru4_mmc_defconfig | 2 +- configs/ts4800_defconfig | 2 +- configs/udoo_defconfig | 2 +- configs/udoo_neo_defconfig | 2 +- configs/usbarmory_defconfig | 2 +- configs/variscite_dart6ul_defconfig | 2 +- configs/vf610twr_defconfig | 2 +- configs/vf610twr_nand_defconfig | 2 +- configs/vining_2000_defconfig | 2 +- configs/wandboard_defconfig | 2 +- configs/warp7_bl33_defconfig | 2 +- configs/warp7_defconfig | 2 +- configs/warp_defconfig | 2 +- configs/woodburn_defconfig | 2 +- configs/woodburn_sd_defconfig | 2 +- configs/xpress_defconfig | 2 +- configs/xpress_spl_defconfig | 2 +- configs/zc5202_defconfig | 2 +- configs/zc5601_defconfig | 2 +- 232 files changed, 305 insertions(+), 305 deletions(-)
arch/arm/cpu/arm1136/mx35/generic.c +5 -5
@@ -14,8 +14,8 @@#include <asm/arch/crm_regs.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> -#ifdef CONFIG_FSL_ESDHC -#include <fsl_esdhc.h> +#ifdef CONFIG_FSL_ESDHC_IMX +#include <fsl_esdhc_imx.h> #endif #include <netdev.h> #include <spl.h>
@@ -27,7 +27,7 @@#define CCM_GET_DIVIDER (x, m, o) (((x) & (m)) >> (o)) -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX DECLARE_GLOBAL_DATA_PTR ;#endif
@@ -446,7 +446,7 @@ int cpu_eth_init(bd_t *bis)return rc; } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX /* * Initializes on-chip MMC controllers. * to override, implement board_mmc_init()
@@ -459,7 +459,7 @@ int cpu_mmc_init(bd_t *bis)int get_clocks (void ) { -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX #if CONFIG_SYS_FSL_ESDHC_ADDR ==MMC_SDHC2_BASE_ADDR gd->arch.sdhc_clk =mxc_get_clock (MXC_ESDHC2_CLK );#elif CONFIG_SYS_FSL_ESDHC_ADDR ==MMC_SDHC3_BASE_ADDR
arch/arm/cpu/arm926ejs/mx25/generic.c +4 -4
@@ -16,8 +16,8 @@#include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> -#ifdef CONFIG_FSL_ESDHC -#include <fsl_esdhc.h> +#ifdef CONFIG_FSL_ESDHC_IMX +#include <fsl_esdhc_imx.h> DECLARE_GLOBAL_DATA_PTR ;#endif
@@ -233,7 +233,7 @@ int cpu_eth_init(bd_t *bis)int get_clocks (void ) { -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX #if CONFIG_SYS_FSL_ESDHC_ADDR ==IMX_MMC_SDHC2_BASE gd->arch.sdhc_clk =mxc_get_clock (MXC_ESDHC2_CLK );#else
@@ -243,7 +243,7 @@ int get_clocks(void)return 0 ; } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX /* * Initializes on-chip MMC controllers. * to override, implement board_mmc_init()
arch/arm/cpu/armv7/vf610/generic.c +5 -5
@@ -10,11 +10,11 @@#include <asm/arch/crm_regs.h> #include <asm/mach-imx/sys_proto.h> #include <netdev.h> -#ifdef CONFIG_FSL_ESDHC -#include <fsl_esdhc.h> +#ifdef CONFIG_FSL_ESDHC_IMX +#include <fsl_esdhc_imx.h> #endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX DECLARE_GLOBAL_DATA_PTR ;#endif
@@ -345,7 +345,7 @@ int cpu_eth_init(bd_t *bis)return rc; } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX int cpu_mmc_init (bd_t *bis) {return fsl_esdhc_mmc_init (bis);
@@ -354,7 +354,7 @@ int cpu_mmc_init(bd_t *bis)int get_clocks (void ) { -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX gd->arch.sdhc_clk =mxc_get_clock (MXC_ESDHC_CLK );#endif return 0 ;
arch/arm/cpu/armv8/s32v234/generic.c +1 -1
@@ -342,7 +342,7 @@ int cpu_eth_init(bd_t * bis)int get_clocks (void ) { -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX gd->arch.sdhc_clk =mxc_get_clock (MXC_USDHC_CLK );#endif return 0 ;
arch/arm/include/asm/global_data.h +1 -1
@@ -9,7 +9,7 @@/* Architecture-specific global data */ struct arch_global_data { -#if defined(CONFIG_FSL_ESDHC ) +#if defined(CONFIG_FSL_ESDHC ) || defined(CONFIG_FSL_ESDHC_IMX )u32 sdhc_clk;#endif
arch/arm/mach-imx/cpu.c +3 -3
@@ -21,8 +21,8 @@#include <thermal.h> #include <sata.h> -#ifdef CONFIG_FSL_ESDHC -#include <fsl_esdhc.h> +#ifdef CONFIG_FSL_ESDHC_IMX +#include <fsl_esdhc_imx.h> #endif static u32 reset_cause =-1 ;
@@ -258,7 +258,7 @@ int cpu_eth_init(bd_t *bis)return rc; } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX /* * Initializes on-chip MMC controllers. * to override, implement board_mmc_init()
arch/arm/mach-imx/mx6/litesom.c +2 -2
@@ -16,7 +16,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 <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), }; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg emmc_cfg = {USDHC2_BASE_ADDR ,0 ,8 };#define EMMC_PWR_GPIO IMX_GPIO_NR(4, 10)
arch/arm/mach-imx/mx7/clock.c +2 -2
@@ -19,13 +19,13 @@ struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)ANATOP_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 ;#endif int get_clocks (void ) { -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX #if CONFIG_SYS_FSL_ESDHC_ADDR ==USDHC2_BASE_ADDR gd->arch.sdhc_clk =mxc_get_clock (MXC_ESDHC2_CLK );#elif CONFIG_SYS_FSL_ESDHC_ADDR ==USDHC3_BASE_ADDR
arch/arm/mach-imx/mx7ulp/clock.c +1 -1
@@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;int get_clocks (void ) { -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX #if CONFIG_SYS_FSL_ESDHC_ADDR ==USDHC0_RBASE gd->arch.sdhc_clk =mxc_get_clock (MXC_ESDHC_CLK );#elif CONFIG_SYS_FSL_ESDHC_ADDR ==USDHC1_RBASE
arch/arm/mach-imx/speed.c +2 -2
@@ -11,13 +11,13 @@#include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX DECLARE_GLOBAL_DATA_PTR ;#endif int get_clocks (void ) { -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX #ifdef CONFIG_FSL_USDHC #if CONFIG_SYS_FSL_ESDHC_ADDR ==USDHC2_BASE_ADDR gd->arch.sdhc_clk =mxc_get_clock (MXC_ESDHC2_CLK );
arch/m68k/cpu/mcf5445x/cpu_init.c +1 -1
@@ -200,7 +200,7 @@ void cpu_init_f(void)/* Lowest slew rate for UART0,1,2 */ out_8 (&gpio->srcr_uart,0x00 ); -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX /* eSDHC pin as faster speed */ out_8 (&gpio->srcr_sdhc,0x03 );
board/advantech/dms-ba16/dms-ba16.c +2 -2
@@ -16,7 +16,7 @@#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[3 ] = { {USDHC2_BASE_ADDR }, {USDHC3_BASE_ADDR},
board/aristainetos/aristainetos-v1.c +1 -1
@@ -20,7 +20,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/mxc_hdmi.h>
board/aristainetos/aristainetos-v2.c +1 -1
@@ -20,7 +20,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/mxc_hdmi.h>
board/aristainetos/aristainetos.c +2 -2
@@ -20,7 +20,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/mxc_hdmi.h>
@@ -107,7 +107,7 @@ int dram_init(void)return 0 ; } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[2 ] = { {USDHC1_BASE_ADDR }, {USDHC2_BASE_ADDR},
board/bachmann/ot1200/ot1200.c +1 -1
@@ -18,7 +18,7 @@#include <asm/arch/crm_regs.h> #include <asm/arch/sys_proto.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <netdev.h> #include <i2c.h> #include <pca953x.h>
board/barco/platinum/platinum.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/io.h>
board/barco/titanium/titanium.c +2 -2
@@ -16,7 +16,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/boot_mode.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <micrel.h> #include <miiphy.h> #include <netdev.h>
@@ -215,7 +215,7 @@ int board_ehci_hcd_init(int port)#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[1 ] = { {USDHC3_BASE_ADDR }, };
board/boundary/nitrogen6x/nitrogen6x.c +2 -2
@@ -21,7 +21,7 @@#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <micrel.h> #include <miiphy.h> #include <netdev.h>
@@ -283,7 +283,7 @@ int board_ehci_power(int port, int on)#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg usdhc_cfg[2 ] = { {USDHC3_BASE_ADDR }, {USDHC4_BASE_ADDR},
board/ccv/xpress/xpress.c +1 -1
@@ -16,7 +16,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <asm/io.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <miiphy.h> #include <mmc.h>
board/compulab/cl-som-imx7/cl-som-imx7.c +3 -3
@@ -12,7 +12,7 @@#include <mmc.h> #include <phy.h> #include <netdev.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <power/pmic.h> #include <power/pfuze3000_pmic.h> #include <asm/mach-imx/mxc_i2c.h>
@@ -68,7 +68,7 @@ int dram_init(void)return 0 ; } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX #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; } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ #ifdef CONFIG_FEC_MXC
board/compulab/cl-som-imx7/common.c +3 -3
@@ -8,7 +8,7 @@*/ #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm-generic/gpio.h> #include "common.h"
@@ -23,7 +23,7 @@ int board_spi_cs_gpio(unsigned int bus, unsigned int cs)#endif /* CONFIG_SPI */ -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX int board_mmc_getcd (struct mmc *mmc) {
@@ -42,4 +42,4 @@ int board_mmc_getcd(struct mmc *mmc) return ret; } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */
board/compulab/cl-som-imx7/common.h +4 -4
@@ -9,19 +9,19 @@#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)PADS_SET_PROT (usdhc1_pads); -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ PADS_SET_PROT (uart1_pads);#ifdef CONFIG_SPI PADS_SET_PROT (espi1_pads);#endif /* CONFIG_SPI */ #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX PADS_SET_PROT (usdhc3_emmc_pads); -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ #ifdef CONFIG_FEC_MXC PADS_SET_PROT (phy1_rst_pads);PADS_SET_PROT (fec1_pads);
board/compulab/cl-som-imx7/mux.c +4 -4
@@ -17,7 +17,7 @@ void cl_som_imx7_##pads_array##_set(void) \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 | \ PAD_CTL_HYS | PAD_CTL_PUE | \
@@ -36,7 +36,7 @@ static iomux_v3_cfg_t const usdhc1_pads[] = { PADS_SET(usdhc1_pads) -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ #define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \ PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
@@ -69,7 +69,7 @@ PADS_SET(espi1_pads)#ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static iomux_v3_cfg_t const usdhc3_emmc_pads[] = { 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) -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ #ifdef CONFIG_FEC_MXC
board/compulab/cl-som-imx7/spl.c +3 -3
@@ -9,14 +9,14 @@#include <common.h> #include <spl.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/arch-mx7/mx7-pins.h> #include <asm/arch-mx7/clock.h> #include <asm/arch-mx7/mx7-ddr.h> #include "common.h" -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg cl_som_imx7_spl_usdhc_cfg = {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 );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[] = { MX7D_PAD_SAI1_TX_SYNC__GPIO6_IO14 | MUX_PAD_CTRL(PAD_CTL_PUS_PU5KOHM |
board/compulab/cm_fx6/cm_fx6.c +2 -2
@@ -12,7 +12,7 @@#include <dm.h> #include <dwc_ahsata.h> #include <environment.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <mtd_node.h> #include <netdev.h>
@@ -608,7 +608,7 @@ int board_init(void)cm_fx6_setup_display ();/* 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 )) {int i;
board/compulab/cm_fx6/common.c +2 -2
@@ -11,10 +11,10 @@#include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/mach-imx/spi.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include "common.h" -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX #define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ PAD_CTL_SRE_FAST | PAD_CTL_HYS)
board/compulab/cm_fx6/spl.c +1 -1
@@ -16,7 +16,7 @@#include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> #include <asm/mach-imx/iomux-v3.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include "common.h" enum ddr_config {
board/congatec/cgtqmx6eval/cgtqmx6eval.c +2 -2
@@ -21,7 +21,7 @@#include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <input.h> #include <power/pmic.h>
@@ -411,7 +411,7 @@ static void setup_spi(void) }#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg usdhc_cfg[] = { {USDHC2_BASE_ADDR }, {USDHC3_BASE_ADDR},
board/dhelectronics/dh_imx6/dh_imx6.c +1 -1
@@ -24,7 +24,7 @@#include <dwc_ahsata.h> #include <environment.h> #include <errno.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <fuse.h> #include <i2c.h> #include <miiphy.h>
board/dhelectronics/dh_imx6/dh_imx6_spl.c +1 -1
@@ -20,7 +20,7 @@#include <asm/io.h> #include <errno.h> #include <fuse.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <mmc.h> #include <spl.h>
board/el/el6x/el6x.c +2 -2
@@ -16,7 +16,7 @@#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.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), }; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[2 ] = { {USDHC2_BASE_ADDR }, {USDHC4_BASE_ADDR},
board/embest/mx6boards/mx6boards.c +2 -2
@@ -27,7 +27,7 @@#include <i2c.h> #include <input.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.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), }; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[3 ] = { {USDHC2_BASE_ADDR }, {USDHC3_BASE_ADDR},
board/freescale/imx8mq_evk/imx8mq_evk.c +1 -1
@@ -11,7 +11,7 @@#include <netdev.h> #include <asm/mach-imx/iomux-v3.h> #include <asm-generic/gpio.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <mmc.h> #include <asm/arch/imx8mq_pins.h> #include <asm/arch/sys_proto.h>
board/freescale/imx8mq_evk/spl.c +1 -1
@@ -16,7 +16,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/gpio.h> #include <asm/mach-imx/mxc_i2c.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <mmc.h> #include <power/pmic.h> #include <power/pfuze100_pmic.h>
board/freescale/imx8qxp_mek/imx8qxp_mek.c +1 -1
@@ -7,7 +7,7 @@#include <errno.h> #include <linux/libfdt.h> #include <environment.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/clock.h>
board/freescale/m54418twr/m54418twr.c +1 -1
@@ -9,7 +9,7 @@#include <asm/io.h> #include <asm/immap.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> DECLARE_GLOBAL_DATA_PTR ;
board/freescale/mx25pdk/mx25pdk.c +3 -3
@@ -12,7 +12,7 @@#include <asm/arch/iomux-mx25.h> #include <asm/arch/clock.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <power/pmic.h> #include <fsl_pmic.h>
@@ -24,7 +24,7 @@DECLARE_GLOBAL_DATA_PTR ; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[1 ] = { {IMX_MMC_SDHC1_BASE }, };
@@ -151,7 +151,7 @@ int board_late_init(void)return 0 ; } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX int board_mmc_getcd (struct mmc *mmc) {/* Set up the Card Detect pin. */
board/freescale/mx35pdk/mx35pdk.c +2 -2
@@ -16,7 +16,7 @@#include <power/pmic.h> #include <fsl_pmic.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <mc9sdz60.h> #include <mc13892.h> #include <linux/types.h>
@@ -261,7 +261,7 @@ int board_eth_init(bd_t *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 };
board/freescale/mx51evk/mx51evk.c +3 -3
@@ -16,7 +16,7 @@#include <i2c.h> #include <input.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <power/pmic.h> #include <fsl_pmic.h> #include <mc13892.h>
@@ -24,7 +24,7 @@DECLARE_GLOBAL_DATA_PTR ; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[2 ] = { {MMC_SDHC1_BASE_ADDR }, {MMC_SDHC2_BASE_ADDR},
@@ -262,7 +262,7 @@ static void power_init(void)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) {struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
board/freescale/mx53ard/mx53ard.c +2 -2
@@ -13,7 +13,7 @@#include <linux/errno.h> #include <netdev.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/gpio.h> #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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[2 ] = { {MMC_SDHC1_BASE_ADDR }, {MMC_SDHC2_BASE_ADDR},
board/freescale/mx53evk/mx53evk.c +2 -2
@@ -15,7 +15,7 @@#include <netdev.h> #include <i2c.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <power/pmic.h> #include <fsl_pmic.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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[2 ] = { {MMC_SDHC1_BASE_ADDR }, {MMC_SDHC3_BASE_ADDR},
board/freescale/mx53loco/mx53loco.c +2 -2
@@ -18,7 +18,7 @@#include <i2c.h> #include <input.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/gpio.h> #include <power/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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[2 ] = { {MMC_SDHC1_BASE_ADDR }, {MMC_SDHC3_BASE_ADDR},
board/freescale/mx53smd/mx53smd.c +2 -2
@@ -13,7 +13,7 @@#include <linux/errno.h> #include <netdev.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/gpio.h> 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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[1 ] = { {MMC_SDHC1_BASE_ADDR }, };
board/freescale/mx6qarm2/mx6qarm2.c +2 -2
@@ -12,7 +12,7 @@#include <asm/gpio.h> #include <asm/mach-imx/iomux-v3.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[2 ] = { {USDHC3_BASE_ADDR }, {USDHC4_BASE_ADDR},
board/freescale/mx6sabreauto/mx6sabreauto.c +2 -2
@@ -18,7 +18,7 @@#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/spi.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/sys_proto.h>
@@ -282,7 +282,7 @@ static void setup_iomux_uart(void)SETUP_IOMUX_PADS (uart4_pads); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg usdhc_cfg[1 ] = { {USDHC3_BASE_ADDR }, };
board/freescale/mx6sabresd/mx6sabresd.c +2 -2
@@ -17,7 +17,7 @@#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/mxc_hdmi.h>
@@ -250,7 +250,7 @@ static void setup_iomux_uart(void)SETUP_IOMUX_PADS (uart1_pads); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[3 ] = { {USDHC2_BASE_ADDR }, {USDHC3_BASE_ADDR},
board/freescale/mx6slevk/mx6slevk.c +1 -1
@@ -19,7 +19,7 @@#include <asm/io.h> #include <linux/sizes.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <mmc.h> #include <netdev.h>
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +1 -1
@@ -17,7 +17,7 @@#include <asm/io.h> #include <linux/sizes.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <power/pmic.h>
board/freescale/mx6sxsabresd/mx6sxsabresd.c +1 -1
@@ -17,7 +17,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <linux/sizes.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <mmc.h> #include <i2c.h> #include <miiphy.h>
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +2 -2
@@ -16,7 +16,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <asm/io.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <miiphy.h> #include <linux/sizes.h>
@@ -189,7 +189,7 @@ static int board_qspi_init(void) }#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg usdhc_cfg[2] = { {USDHC1_BASE_ADDR, 0, 4}, #if defined(CONFIG_MX6UL_14X14_EVK_EMMC_REWORK)
board/freescale/mx6ullevk/mx6ullevk.c +1 -1
@@ -14,7 +14,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 <mmc.h>
board/freescale/mx7dsabresd/mx7dsabresd.c +1 -1
@@ -12,7 +12,7 @@#include <asm/io.h> #include <linux/sizes.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <mmc.h> #include <miiphy.h> #include <netdev.h>
board/freescale/s32v234evb/s32v234evb.c +2 -2
@@ -10,7 +10,7 @@#include <asm/arch/lpddr2.h> #include <asm/arch/clock.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <i2c.h>
@@ -74,7 +74,7 @@ void setup_iomux_nfc(void) }#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[1 ] = { {USDHC_BASE_ADDR }, };
board/freescale/vf610twr/vf610twr.c +2 -2
@@ -11,7 +11,7 @@#include <asm/arch/crm_regs.h> #include <asm/arch/clock.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[1 ] = { {ESDHC1_BASE_ADDR }, };
board/gateworks/gw_ventana/common.c +3 -3
@@ -10,7 +10,7 @@#include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/mach-imx/mxc_i2c.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <hwconfig.h> #include <power/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 ];int board_mmc_init (bd_t *bis)
@@ -1753,4 +1753,4 @@ int board_mmc_getcd(struct mmc *mmc) return -1; } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */
board/gateworks/gw_ventana/gw_ventana.c +1 -1
@@ -25,7 +25,7 @@#include <hwconfig.h> #include <i2c.h> #include <fdt_support.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <jffs2/load_kernel.h> #include <linux/ctype.h> #include <miiphy.h>
board/ge/bx50v3/bx50v3.c +1 -1
@@ -17,7 +17,7 @@#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <net.h> #include <netdev.h>
board/ge/mx53ppd/mx53ppd.c +1 -1
@@ -24,7 +24,7 @@#include <netdev.h> #include <i2c.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/gpio.h> #include <power/pmic.h> #include <dialog_pmic.h>
board/grinn/liteboard/board.c +2 -2
@@ -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)
board/inversepath/usbarmory/usbarmory.c +1 -1
@@ -17,7 +17,7 @@#include <linux/errno.h> #include <i2c.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/gpio.h> DECLARE_GLOBAL_DATA_PTR ;
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +2 -2
@@ -18,7 +18,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/mxc_i2c.h> #include <errno.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <fuse.h> #include <i2c.h> #include <miiphy.h>
@@ -166,7 +166,7 @@ int board_phy_config(struct phy_device *phydev) }#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX #define USDHC2_CD_GPIO IMX_GPIO_NR(1, 4) static struct fsl_esdhc_cfg usdhc_cfg[] = {
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c +1 -1
@@ -20,7 +20,7 @@#include <asm/io.h> #include <errno.h> #include <fuse.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <mmc.h> #include <spl.h>
board/kosagi/novena/novena.c +1 -1
@@ -25,7 +25,7 @@#include <asm/mach-imx/video.h> #include <dwc_ahsata.h> #include <environment.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <input.h> #include <ipu_pixfmt.h>
board/kosagi/novena/novena_spl.c +3 -3
@@ -19,7 +19,7 @@#include <asm/arch/crm_regs.h> #include <i2c.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <spl.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 */ -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg usdhc_cfg = {USDHC3_BASE_ADDR ,0 ,4 };
@@ -566,7 +566,7 @@ void board_init_f(ulong dummy)#ifdef CONFIG_BOARD_POSTCLK_INIT board_postclk_init ();#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX get_clocks ();#endif
board/liebherr/display5/common.c +1 -1
@@ -89,7 +89,7 @@ void displ5_set_iomux_ecspi_spl(void) {}void displ5_set_iomux_ecspi (void ) {}#endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX iomux_v3_cfg_t const usdhc4_pads[] = {MX6_PAD_SD4_CLK__SD4_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), MX6_PAD_SD4_CMD__SD4_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
board/liebherr/display5/display5.c +3 -3
@@ -21,7 +21,7 @@#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/spi.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.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), }; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[1 ] = { {USDHC4_BASE_ADDR ,0 ,8 , }, };
@@ -204,7 +204,7 @@ int board_mmc_init(bd_t *bis) return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ static void displ5_setup_ecspi (void ) {
board/liebherr/display5/spl.c +1 -1
@@ -18,7 +18,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/gpio.h> #include <environment.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <netdev.h> #include <bootcount.h> #include <watchdog.h>
board/liebherr/mccmon6/mccmon6.c +1 -1
@@ -16,7 +16,7 @@#include <asm/mach-imx/spi.h> #include <asm/mach-imx/boot_mode.h> #include <asm/io.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <mmc.h> #include <netdev.h> #include <micrel.h>
board/liebherr/mccmon6/spl.c +1 -1
@@ -14,7 +14,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/arch/crm_regs.h> #include <asm/io.h> #include <asm/arch/sys_proto.h>
board/logicpd/imx6/imx6logic.c +2 -2
@@ -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 */
board/menlo/m53menlo/m53menlo.c +2 -2
@@ -18,7 +18,7 @@#include <asm/gpio.h> #include <asm/spl.h> #include <fdt_support.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <ipu_pixfmt.h> #include <linux/errno.h>
@@ -150,7 +150,7 @@ static void setup_iomux_fec(void)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 = {MMC_SDHC1_BASE_ADDR , };
board/phytec/pcl063/pcl063.c +1 -1
@@ -12,7 +12,7 @@#include <asm/arch/sys_proto.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/mxc_i2c.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <linux/bitops.h> #include <miiphy.h> #include <netdev.h>
board/phytec/pcl063/spl.c +3 -3
@@ -14,7 +14,7 @@#include <asm/arch/mx6-pins.h> #include <asm/arch/crm_regs.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 */
@@ -101,7 +101,7 @@ static void spl_dram_init(void)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 | \ 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; } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ void board_init_f (ulong dummy) {
board/phytec/pcm058/pcm058.c +1 -1
@@ -25,7 +25,7 @@#include <asm/gpio.h> #include <mmc.h> #include <i2c.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <nand.h> #include <miiphy.h> #include <netdev.h>
board/phytec/pfla02/pfla02.c +1 -1
@@ -19,7 +19,7 @@#include <asm/gpio.h> #include <mmc.h> #include <i2c.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <nand.h> #include <miiphy.h> #include <netdev.h>
board/seco/common/mx6.c +1 -1
@@ -16,7 +16,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/boot_mode.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/mxc_hdmi.h>
board/seco/mx6quq7/mx6quq7.c +1 -1
@@ -17,7 +17,7 @@#include <asm/mach-imx/boot_mode.h> #include <malloc.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/mxc_hdmi.h>
board/sks-kinkel/sksimx6/sksimx6.c +1 -1
@@ -12,7 +12,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/arch/crm_regs.h> #include <asm/io.h> #include <asm/arch/sys_proto.h>
board/softing/vining_2000/vining_2000.c +1 -1
@@ -19,7 +19,7 @@#include <linux/sizes.h> #include <common.h> #include <environment.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <mmc.h> #include <i2c.h> #include <miiphy.h>
board/solidrun/mx6cuboxi/mx6cuboxi.c +1 -1
@@ -24,7 +24,7 @@#include <asm/mach-imx/sata.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <malloc.h> #include <miiphy.h> #include <netdev.h>
board/tbs/tbs2910/tbs2910.c +3 -3
@@ -13,7 +13,7 @@#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX /* set environment device to boot device when booting from SD */ 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 */ } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ #ifdef CONFIG_VIDEO_IPUV3 static void do_enable_hdmi (struct display_info_t const *dev)
board/technexion/pico-imx6ul/spl.c +1 -1
@@ -10,7 +10,7 @@#include <asm/gpio.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/boot_mode.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <linux/libfdt.h> #include <spl.h>
board/technexion/pico-imx7d/spl.c +1 -1
@@ -13,7 +13,7 @@#include <asm/arch-mx7/mx7-ddr.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/gpio.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <spl.h> #if defined(CONFIG_SPL_BUILD )
board/technologic/ts4800/ts4800.c +3 -3
@@ -19,7 +19,7 @@#include <environment.h> #include <mmc.h> #include <input.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <mc13892.h> #include <malloc.h>
@@ -29,7 +29,7 @@DECLARE_GLOBAL_DATA_PTR ; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg esdhc_cfg[2 ] = { {MMC_SDHC1_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)); } -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX int board_mmc_getcd (struct mmc *mmc) {struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
board/toradex/apalis_imx6/apalis_imx6.c +3 -3
@@ -27,7 +27,7 @@#include <dm/platform_data/serial_mxc.h> #include <dwc_ahsata.h> #include <environment.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <imx_thermal.h> #include <micrel.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_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) {
@@ -355,7 +355,7 @@ int board_mmc_init(bd_t *bis) 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) {
board/toradex/colibri_imx6/colibri_imx6.c +3 -3
@@ -25,7 +25,7 @@#include <cpu.h> #include <dm/platform_data/serial_mxc.h> #include <environment.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <imx_thermal.h> #include <micrel.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_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[] = {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]); } -#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ +#endif /* CONFIG_FSL_ESDHC_IMX & CONFIG_SPL_BUILD */ int board_phy_config (struct phy_device *phydev) {
board/toradex/colibri_imx7/colibri_imx7.c +1 -1
@@ -15,7 +15,7 @@#include <dm.h> #include <dm/platform_data/serial_mxc.h> #include <fdt_support.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <jffs2/load_kernel.h> #include <linux/sizes.h> #include <mmc.h>
board/tqc/tqma6/tqma6.c +1 -1
@@ -18,7 +18,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/spi.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <linux/libfdt.h> #include <i2c.h> #include <mmc.h>
board/tqc/tqma6/tqma6_mba6.c +1 -1
@@ -18,7 +18,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <linux/libfdt.h> #include <malloc.h> #include <i2c.h>
board/tqc/tqma6/tqma6_wru4.c +1 -1
@@ -21,7 +21,7 @@#include <asm/mach-imx/mxc_i2c.h> #include <common.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <linux/libfdt.h> #include <malloc.h> #include <i2c.h>
board/udoo/neo/neo.c +1 -1
@@ -16,7 +16,7 @@#include <asm/gpio.h> #include <asm/mach-imx/iomux-v3.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/arch/crm_regs.h> #include <asm/io.h> #include <asm/mach-imx/mxc_i2c.h>
board/udoo/udoo.c +1 -1
@@ -15,7 +15,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/sata.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/arch/crm_regs.h> #include <asm/io.h> #include <asm/arch/sys_proto.h>
board/udoo/udoo_spl.c +1 -1
@@ -15,7 +15,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/arch/crm_regs.h> #include <asm/io.h> #include <asm/arch/sys_proto.h>
board/variscite/dart_6ul/dart_6ul.c +1 -1
@@ -10,7 +10,7 @@#include <asm/arch/sys_proto.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/mxc_i2c.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <linux/bitops.h> #include <miiphy.h> #include <netdev.h>
board/variscite/dart_6ul/spl.c +1 -1
@@ -11,7 +11,7 @@#include <asm/arch/mx6-ddr.h> #include <asm/arch/mx6-pins.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 | \ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
board/wandboard/spl.c +1 -1
@@ -14,7 +14,7 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/arch/crm_regs.h> #include <asm/io.h> #include <asm/arch/sys_proto.h>
board/warp/warp.c +1 -1
@@ -19,7 +19,7 @@#include <linux/sizes.h> #include <common.h> #include <watchdog.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <mmc.h> #include <usb.h>
board/woodburn/woodburn.c +2 -2
@@ -17,7 +17,7 @@#include <fsl_pmic.h> #include <mc13892.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <linux/types.h> #include <asm/gpio.h> #include <asm/arch/sys_proto.h>
@@ -206,7 +206,7 @@ int board_init(void)return 0 ; } -#if defined(CONFIG_FSL_ESDHC ) +#if defined(CONFIG_FSL_ESDHC_IMX )struct fsl_esdhc_cfg esdhc_cfg = {MMC_SDHC1_BASE_ADDR };int board_mmc_init (bd_t *bis)
configs/apalis_imx6_defconfig +1 -1
@@ -62,7 +62,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y
configs/aristainetos2_defconfig +1 -1
@@ -35,7 +35,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y
configs/aristainetos2b_defconfig +1 -1
@@ -35,7 +35,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y
configs/aristainetos_defconfig +1 -1
@@ -35,7 +35,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y
configs/bk4r1_defconfig +1 -1
@@ -52,7 +52,7 @@ CONFIG_SYS_EEPROM_SIZE=32768 CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=6 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2 CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND_VF610_NFC=y CONFIG_NAND_VF610_NFC_DT=y
configs/cgtqmx6eval_defconfig +1 -1
@@ -55,7 +55,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_SF=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/cl-som-imx7_defconfig +1 -1
@@ -51,7 +51,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/cm_fx6_defconfig +1 -1
@@ -55,7 +55,7 @@ CONFIG_DWC_AHSATA=y # CONFIG_DWC_AHSATA_AHCI is not set CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y
configs/colibri-imx6ull_defconfig +1 -1
@@ -54,7 +54,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_MXS=y
configs/colibri_imx6_defconfig +1 -1
@@ -61,7 +61,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/colibri_imx7_defconfig +1 -1
@@ -53,7 +53,7 @@ CONFIG_DFU_NAND=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_MXS_DT=y
configs/colibri_imx7_emmc_defconfig +1 -1
@@ -49,7 +49,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/colibri_vf_defconfig +1 -1
@@ -58,7 +58,7 @@ CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y CONFIG_DM_MMC=y # CONFIG_MMC_HW_PARTITIONING is not set -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND_VF610_NFC=y CONFIG_NAND_VF610_NFC_DT=y
configs/dh_imx6_defconfig +1 -1
@@ -46,7 +46,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-dhcom-pdk2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/display5_defconfig +1 -1
@@ -64,7 +64,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1
configs/display5_factory_defconfig +1 -1
@@ -65,7 +65,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1
configs/dms-ba16-1g_defconfig +1 -1
@@ -33,7 +33,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/dms-ba16_defconfig +1 -1
@@ -32,7 +32,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/ge_bx50v3_defconfig +1 -1
@@ -43,7 +43,7 @@ CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5" CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/gwventana_emmc_defconfig +1 -1
@@ -63,7 +63,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD_DEVICE=y CONFIG_PHYLIB=y CONFIG_E1000=y
configs/gwventana_gw5904_defconfig +1 -1
@@ -63,7 +63,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD_DEVICE=y CONFIG_PHYLIB=y CONFIG_MV88E61XX_SWITCH=y
configs/gwventana_nand_defconfig +1 -1
@@ -65,7 +65,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/imx6dl_icore_nand_defconfig +1 -1
@@ -40,7 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/imx6dl_mamoj_defconfig +1 -1
@@ -33,7 +33,7 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=2 CONFIG_SYS_I2C_MXC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/imx6q_icore_nand_defconfig +1 -1
@@ -41,7 +41,7 @@ CONFIG_CMD_UBI=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/imx6q_logic_defconfig +1 -1
@@ -63,7 +63,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_PCF8575_GPIO=y CONFIG_LED=y CONFIG_LED_GPIO=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_MXS=y
configs/imx6qdl_icore_mipi_defconfig +1 -1
@@ -45,7 +45,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-mipi" CONFIG_OF_LIST="imx6q-icore-mipi imx6dl-icore-mipi" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_FEC_MXC=y
configs/imx6qdl_icore_mmc_defconfig +1 -1
@@ -55,7 +55,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/imx6qdl_icore_nand_defconfig +1 -1
@@ -40,7 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/imx6qdl_icore_rqs_defconfig +1 -1
@@ -42,7 +42,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs" CONFIG_OF_LIST="imx6q-icore-rqs imx6dl-icore-rqs" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/imx6ul_geam_mmc_defconfig +1 -1
@@ -39,7 +39,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_FEC_MXC=y
configs/imx6ul_geam_nand_defconfig +1 -1
@@ -41,7 +41,7 @@ CONFIG_CMD_UBI=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/imx6ul_isiot_emmc_defconfig +1 -1
@@ -39,7 +39,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-emmc" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_FEC_MXC=y
configs/imx6ul_isiot_nand_defconfig +1 -1
@@ -41,7 +41,7 @@ CONFIG_CMD_UBI=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-nand" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/imx8mq_evk_defconfig +1 -1
@@ -31,7 +31,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_DM_ETH=y CONFIG_PINCTRL=y
configs/imx8qm_mek_defconfig +1 -1
@@ -52,7 +52,7 @@ CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y
configs/imx8qxp_mek_defconfig +1 -1
@@ -55,7 +55,7 @@ CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y
configs/kp_imx53_defconfig +1 -1
@@ -31,7 +31,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx53-kp" CONFIG_ENV_IS_IN_MMC=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_FEC_MXC=y
configs/kp_imx6q_tpc_defconfig +1 -1
@@ -34,7 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y CONFIG_FEC_MXC=y
configs/liteboard_defconfig +1 -1
@@ -39,7 +39,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_DM_ETH=y CONFIG_MII=y
configs/m53menlo_defconfig +1 -1
@@ -52,7 +52,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y
configs/marsboard_defconfig +1 -1
@@ -21,7 +21,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/mccmon6_nor_defconfig +1 -1
@@ -29,7 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nor:32m at 0x0(mccmon6-image.nor),256k at 0x CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_DEVICE=y
configs/mccmon6_sd_defconfig +1 -1
@@ -30,7 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nor:32m at 0x0(mccmon6-image.nor),256k at 0x CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_DEVICE=y
configs/mx25pdk_defconfig +1 -1
@@ -19,7 +19,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_FS_EXT4=y CONFIG_FS_FAT=y
configs/mx35pdk_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_MXC_GPIO=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/mx51evk_defconfig +1 -1
@@ -21,7 +21,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/mx53ard_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_MII=y
configs/mx53cx9020_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_FPGA_ALTERA=y CONFIG_FPGA_CYCLON2=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y
configs/mx53evk_defconfig +1 -1
@@ -14,6 +14,6 @@ CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/mx53loco_defconfig +1 -1
@@ -23,7 +23,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DWC_AHSATA=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_EHCI_MX5=y
configs/mx53ppd_defconfig +1 -1
@@ -39,7 +39,7 @@ CONFIG_BOOTCOUNT_EXT=y CONFIG_BOOTCOUNT_BOOTLIMIT=10 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX5=y
configs/mx53smd_defconfig +1 -1
@@ -14,6 +14,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/mx6cuboxi_defconfig +1 -1
@@ -33,7 +33,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_DWC_AHSATA=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_DM_THERMAL=y
configs/mx6dlarm2_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx6dlarm2_lpddr2_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx6qarm2_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx6qarm2_lpddr2_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx6qsabrelite_defconfig +1 -1
@@ -34,7 +34,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=25000000
configs/mx6sabreauto_defconfig +1 -1
@@ -62,7 +62,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_SF=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_DM_SPI_FLASH=y
configs/mx6sabresd_defconfig +1 -1
@@ -74,7 +74,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=2 CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/mx6slevk_defconfig +1 -1
@@ -34,7 +34,7 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/mx6slevk_spinor_defconfig +1 -1
@@ -34,7 +34,7 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/mx6slevk_spl_defconfig +1 -1
@@ -43,7 +43,7 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/mx6sllevk_defconfig +1 -1
@@ -30,7 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_PMIC=y
configs/mx6sllevk_plugin_defconfig +1 -1
@@ -31,7 +31,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_PMIC=y
configs/mx6sxsabreauto_defconfig +1 -1
@@ -34,7 +34,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_DM_SPI_FLASH=y
configs/mx6sxsabresd_defconfig +1 -1
@@ -38,7 +38,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1
configs/mx6sxsabresd_spl_defconfig +1 -1
@@ -47,7 +47,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y
configs/mx6ul_14x14_evk_defconfig +1 -1
@@ -44,7 +44,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/mx6ul_9x9_evk_defconfig +1 -1
@@ -44,7 +44,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/mx6ull_14x14_evk_defconfig +1 -1
@@ -30,7 +30,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/mx6ull_14x14_evk_plugin_defconfig +1 -1
@@ -31,7 +31,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/mx7dsabresd_defconfig +1 -1
@@ -48,7 +48,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_PHYLIB=y
configs/mx7dsabresd_qspi_defconfig +1 -1
@@ -48,7 +48,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/mx7ulp_evk_defconfig +1 -1
@@ -22,7 +22,7 @@ CONFIG_IMX_RGPIO2P=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7ULP=y CONFIG_DM_REGULATOR=y
configs/mx7ulp_evk_plugin_defconfig +1 -1
@@ -21,7 +21,7 @@ CONFIG_IMX_RGPIO2P=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7ULP=y CONFIG_DM_REGULATOR=y
configs/nitrogen6dl2g_defconfig +1 -1
@@ -36,7 +36,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=25000000
configs/nitrogen6dl_defconfig +1 -1
@@ -36,7 +36,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=25000000
configs/nitrogen6q2g_defconfig +1 -1
@@ -38,7 +38,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=25000000
configs/nitrogen6q_defconfig +1 -1
@@ -38,7 +38,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=25000000
configs/nitrogen6s1g_defconfig +1 -1
@@ -36,7 +36,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=25000000
configs/nitrogen6s_defconfig +1 -1
@@ -36,7 +36,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=25000000
configs/novena_defconfig +1 -1
@@ -50,7 +50,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y
configs/opos6uldev_defconfig +1 -1
@@ -69,7 +69,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_PWRSEQ=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/ot1200_defconfig +1 -1
@@ -31,7 +31,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_CMD_PCA953X=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=2 CONFIG_SF_DEFAULT_MODE=0
configs/ot1200_spl_defconfig +1 -1
@@ -41,7 +41,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_CMD_PCA953X=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=2 CONFIG_SF_DEFAULT_MODE=0
configs/pcm052_defconfig +1 -1
@@ -39,7 +39,7 @@ CONFIG_SYS_EEPROM_SIZE=32768 CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=6 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2 CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND_VF610_NFC=y CONFIG_NAND_VF610_NFC_DT=y
configs/pcm058_defconfig +1 -1
@@ -43,7 +43,7 @@ CONFIG_CMD_UBI=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_MXS=y
configs/pfla02_defconfig +1 -1
@@ -42,7 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:-(nand);spi2.0:1024k(bootloader),64k CONFIG_CMD_UBI=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DM=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_MXS=y
configs/phycore_pcl063_defconfig +1 -1
@@ -35,7 +35,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-phycore-segin" CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_MXS=y
configs/phycore_pcl063_ull_defconfig +1 -1
@@ -31,7 +31,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-phycore-segin" CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y
configs/pico-hobbit-imx6ul_defconfig +1 -1
@@ -46,7 +46,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/pico-hobbit-imx7d_defconfig +1 -1
@@ -52,7 +52,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PINCTRL=y
configs/pico-imx6ul_defconfig +1 -1
@@ -48,7 +48,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/pico-imx7d_bl33_defconfig +1 -1
@@ -43,7 +43,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PINCTRL=y
configs/pico-imx7d_defconfig +1 -1
@@ -52,7 +52,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PINCTRL=y
configs/pico-pi-imx6ul_defconfig +1 -1
@@ -46,7 +46,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/pico-pi-imx7d_defconfig +1 -1
@@ -52,7 +52,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PINCTRL=y
configs/platinum_picon_defconfig +1 -1
@@ -47,7 +47,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),495M(ubi0),14M(res0),2M(res1),512k(res2),512k(res3),-(ubi1)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/platinum_titanium_defconfig +1 -1
@@ -47,7 +47,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/riotboard_defconfig +1 -1
@@ -22,7 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/riotboard_spl_defconfig +1 -1
@@ -32,7 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000
configs/s32v234evb_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_DM_SERIAL=y CONFIG_FSL_LINFLEXUART=y CONFIG_OF_LIBFDT=y
configs/secomx6quq7_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y
configs/sksimx6_defconfig +1 -1
@@ -33,7 +33,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y
configs/tbs2910_defconfig +1 -1
@@ -48,7 +48,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y
configs/titanium_defconfig +1 -1
@@ -34,7 +34,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y
configs/tqma6dl_mba6_mmc_defconfig +1 -1
@@ -32,7 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=50000000
configs/tqma6dl_mba6_spi_defconfig +1 -1
@@ -33,7 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=50000000
configs/tqma6q_mba6_mmc_defconfig +1 -1
@@ -31,7 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=50000000
configs/tqma6q_mba6_spi_defconfig +1 -1
@@ -32,7 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=50000000
configs/tqma6s_mba6_mmc_defconfig +1 -1
@@ -32,7 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=50000000
configs/tqma6s_mba6_spi_defconfig +1 -1
@@ -33,7 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=50000000
configs/tqma6s_wru4_mmc_defconfig +1 -1
@@ -59,7 +59,7 @@ CONFIG_LED_STATUS_BIT5=5 CONFIG_LED_STATUS_STATE5=2 CONFIG_LED_STATUS_CMD=y CONFIG_PCA9551_LED=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_USB=y
configs/ts4800_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_SPI=y
configs/udoo_defconfig +1 -1
@@ -29,7 +29,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_DWC_AHSATA=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y
configs/udoo_neo_defconfig +1 -1
@@ -28,7 +28,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/usbarmory_defconfig +1 -1
@@ -13,7 +13,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_ENV_IS_IN_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_USB=y CONFIG_USB_EHCI_MX5=y CONFIG_OF_LIBFDT=y
configs/variscite_dart6ul_defconfig +1 -1
@@ -30,7 +30,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-dart-6ul" CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_MXC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y
configs/vf610twr_defconfig +1 -1
@@ -32,7 +32,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_PHYLIB=y
configs/vf610twr_nand_defconfig +1 -1
@@ -32,7 +32,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_PHYLIB=y
configs/vining_2000_defconfig +1 -1
@@ -42,7 +42,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y
configs/wandboard_defconfig +1 -1
@@ -47,7 +47,7 @@ CONFIG_SYS_I2C_MXC_I2C1=y CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_MMC=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PINCTRL=y
configs/warp7_bl33_defconfig +1 -1
@@ -30,7 +30,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y
configs/warp7_defconfig +1 -1
@@ -39,7 +39,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y
configs/warp_defconfig +1 -1
@@ -30,7 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y # CONFIG_NET is not set CONFIG_DFU_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y
configs/woodburn_defconfig +1 -1
@@ -28,7 +28,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_MXC_GPIO=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/woodburn_sd_defconfig +1 -1
@@ -40,7 +40,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_MXC_GPIO=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/xpress_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_USB=y
configs/xpress_spl_defconfig +1 -1
@@ -37,7 +37,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_USB=y
configs/zc5202_defconfig +1 -1
@@ -35,7 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=3 CONFIG_SF_DEFAULT_MODE=0
configs/zc5601_defconfig +1 -1
@@ -34,7 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_IMX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=3 CONFIG_SF_DEFAULT_MODE=0
Signature · 1 line
2.7.4
PATCH v6 4/5 mmc: fsl_esdhc: drop i.MX code
In reply to Yangbo LuDropped i.MX code which couldn't be reused.
---
Changes for v2:
- Added this patch.
Changes for v3:
- Rebased.
Changes for v4:
- Rebased.
- Added Tested-by/Acked-by.
Changes for v5:
- Dropped MCF5441x code.
Changes for v6:
- None.
--- drivers/mmc/fsl_esdhc.c | 626 ++---------------------------------------------- include/fsl_esdhc.h | 57 ----- 2 files changed, 16 insertions(+), 667 deletions(-)
drivers/mmc/fsl_esdhc.c +16 -610
@@ -16,14 +16,11 @@#include <hwconfig.h> #include <mmc.h> #include <part.h> -#include <power/regulator.h> #include <malloc.h> #include <fsl_esdhc.h> #include <fdt_support.h> #include <asm/io.h> #include <dm.h> -#include <asm-generic/gpio.h> -#include <dm/pinctrl.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -33,8 +30,6 @@ DECLARE_GLOBAL_DATA_PTR; IRQSTATEN_CIE | IRQSTATEN_DTOE | IRQSTATEN_DCE | \ IRQSTATEN_DEBE | IRQSTATEN_BRR | IRQSTATEN_BWR | \ IRQSTATEN_DINT) -#define MAX_TUNING_LOOP 40 - struct fsl_esdhc { uint dsaddr; /* SDMA system address register */ uint blkattr; /* Block attributes register */
@@ -54,37 +49,20 @@ struct fsl_esdhc {uint autoc12err;/* Auto CMD error status register */ uint hostcapblt;/* Host controller capabilities register */ uint wml;/* Watermark level register */ -uint mixctrl;/* For USDHC */ -char reserved1[4 ];/* reserved */ +char reserved1[8 ];/* reserved */ uint fevt;/* Force event register */ uint admaes;/* ADMA error status register */ uint adsaddr;/* ADMA system address register */ -char reserved2[4 ]; -uint dllctrl; -uint dllstat; -uint clktunectrlstatus; -char reserved3[4 ]; -uint strobe_dllctrl; -uint strobe_dllstat; -char reserved4[72 ]; -uint vendorspec; -uint mmcboot; -uint vendorspec2; -uint tuning_ctrl;/* on i.MX6/7/8 */ -char reserved5[44 ]; +char reserved2[160 ];uint hostver;/* Host controller version register */ -char reserved6[4 ];/* reserved */ +char reserved3[4 ];/* reserved */ uint dmaerraddr;/* DMA error address register */ -char reserved7[4 ];/* reserved */ +char reserved4[4 ];/* reserved */ uint dmaerrattr;/* DMA error attribute register */ -char reserved8[4 ];/* reserved */ +char reserved5[4 ];/* reserved */ uint hostcapblt2;/* Host controller capabilities register 2 */ -char reserved9[8 ];/* reserved */ -uint tcr;/* Tuning control register */ -char reserved10[28 ];/* reserved */ -uint sddirctl;/* SD direction control register */ -char reserved11[712 ];/* reserved */ -uint scr;/* eSDHC control register */ +char reserved6[756 ];/* reserved */ +uint esdhcctl;/* eSDHC control register */ };struct fsl_esdhc_plat {
@@ -92,11 +70,6 @@ struct fsl_esdhc_plat {struct mmc mmc; }; -struct esdhc_soc_data { -u32 flags; -u32 caps; -}; -/** * struct fsl_esdhc_priv *
@@ -109,13 +82,6 @@ struct esdhc_soc_data {* @dev: pointer for the device * @non_removable: 0: removable; 1: non-removable * @wp_enable: 1: enable checking wp; 0: no check -* @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V -* @flags: ESDHC_FLAG_xx in include/fsl_esdhc.h -* @caps: controller capabilities -* @tuning_step: tuning step setting in tuning_ctrl register -* @start_tuning_tap: the start point for tuning in tuning_ctrl register -* @strobe_dll_delay_target: settings in strobe_dllctrl -* @signal_voltage: indicating the current voltage * @cd_gpio: gpio for card detection * @wp_gpio: gpio for write protection */
@@ -124,7 +90,6 @@ struct fsl_esdhc_priv {unsigned int sdhc_clk;struct clk per_clk;unsigned int clock; -unsigned int mode;unsigned int bus_width;#if !CONFIG_IS_ENABLED (BLK )struct mmc *mmc;
@@ -132,21 +97,6 @@ struct fsl_esdhc_priv {struct udevice *dev;int non_removable;int wp_enable; -int vs18_enable; -u32 flags; -u32 caps; -u32 tuning_step; -u32 tuning_start_tap; -u32 strobe_dll_delay_target; -u32 signal_voltage; -#if IS_ENABLED (CONFIG_DM_REGULATOR ) -struct udevice *vqmmc_dev; -struct udevice *vmmc_dev; -#endif -#ifdef CONFIG_DM_GPIO -struct gpio_desc cd_gpio; -struct gpio_desc wp_gpio; -#endif };/* Return the XFERTYP flags for a given command and data packet */
@@ -258,8 +208,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, {int timeout;struct fsl_esdhc *regs = priv->esdhc_regs; -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_FSL_LAYERSCAPE )dma_addr_t addr;#endif uint wml_value;
@@ -272,8 +221,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,esdhc_clrsetbits32 (®s->wml,WML_RD_WML_MASK , wml_value);#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_FSL_LAYERSCAPE ) addr =virt_to_phys ((void *)(data->dest));if (upper_32_bits (addr))printf ("Error found for upper 32 bits\n" );
@@ -297,20 +245,12 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,printf ("\nThe SD card is locked. Can not write to a locked card.\n\n" );return -ETIMEDOUT ; } - }else { -#ifdef CONFIG_DM_GPIO -if (dm_gpio_is_valid (&priv->wp_gpio) &&dm_gpio_get_value (&priv->wp_gpio)) { -printf ("\nThe SD card is locked. Can not write to a locked card.\n\n" ); -return -ETIMEDOUT ; - } -#endif }esdhc_clrsetbits32 (®s->wml,WML_WR_WML_MASK , wml_value <<16 );#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_FSL_LAYERSCAPE ) addr =virt_to_phys ((void *)(data->src));if (upper_32_bits (addr))printf ("Error found for upper 32 bits\n" );
@@ -375,8 +315,7 @@ static void check_and_invalidate_dcache_rangeunsigned end =0 ;unsigned size =roundup (ARCH_DMA_MINALIGN , data->blocks*data->blocksize); -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_FSL_LAYERSCAPE )dma_addr_t addr; addr =virt_to_phys ((void *)(data->dest));
@@ -391,25 +330,6 @@ static void check_and_invalidate_dcache_rangeinvalidate_dcache_range (start, end); } -#ifdef CONFIG_MCF5441x -/* -* Swaps 32-bit words to little-endian byte order. -*/ -static inline void sd_swap_dma_buff (struct mmc_data *data) -{ -int i, size = data->blocksize >>2 ; -u32 *buffer = (u32 *)data->dest; -u32 sw; - -while (data->blocks--) { -for (i =0 ; i < size; i++) { - sw =__sw32 (*buffer); - *buffer++ = sw; - } - } -} -#endif -/* * Sends a command out on the bus. Takes the mmc pointer, * a command pointer, and an optional data pointer.
@@ -466,14 +386,7 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc,/* Send the command */ esdhc_write32 (®s->cmdarg, cmd->cmdarg); -#if defined(CONFIG_FSL_USDHC ) -esdhc_write32 (®s->mixctrl, - (esdhc_read32 (®s->mixctrl) &0xFFFFFF80 ) | (xfertyp &0x7F ) - | (mmc->ddr_mode ?XFERTYP_DDREN :0 )); -esdhc_write32 (®s->xfertyp, xfertyp &0xFFFF0000 ); -#else esdhc_write32 (®s->xfertyp, xfertyp); -#endif if ((cmd->cmdidx ==MMC_CMD_SEND_TUNING_BLOCK ) || (cmd->cmdidx ==MMC_CMD_SEND_TUNING_BLOCK_HS200 ))
@@ -500,15 +413,6 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, goto out; } -/* Switch voltage to 1.8V if CMD11 succeeded */ -if (cmd->cmdidx ==SD_CMD_SWITCH_UHS18V ) { -esdhc_setbits32 (®s->vendorspec,ESDHC_VENDORSPEC_VSELECT ); - -printf ("Run CMD11 1.8V switch\n" ); -/* Sleep for 5 ms - max time for card to switch to 1.8V */ -udelay (5000 ); - } -/* Workaround for ESDHC errata ENGcm03648 */ if (!data && (cmd->resp_type &MMC_RSP_BUSY )) {int timeout =6000 ;
@@ -574,9 +478,6 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc,*/ if (data->flags &MMC_DATA_READ ) {check_and_invalidate_dcache_range (cmd, data); -#ifdef CONFIG_MCF5441x -sd_swap_dma_buff (data); -#endif }#endif }
@@ -596,10 +497,6 @@ out:while ((esdhc_read32 (®s->sysctl) &SYSCTL_RSTD )) ; } - -/* If this was CMD11, then notify that power cycle is needed */ -if (cmd->cmdidx ==SD_CMD_SWITCH_UHS18V ) -printf ("CMD11 to switch to 1.8V mode failed, card requires power cycle.\n" ); }esdhc_write32 (®s->irqstat,-1 );
@@ -611,16 +508,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) {struct fsl_esdhc *regs = priv->esdhc_regs;int div =1 ; -#ifdef ARCH_MXC -#ifdef CONFIG_MX53 -/* For i.MX53 eSDHCv3, SYSCTL.SDCLKFS may not be set to 0. */ -int pre_div = (regs == (struct fsl_esdhc *)MMC_SDHC3_BASE_ADDR ) ?2 :1 ; -#else -int pre_div =1 ; -#endif -#else int pre_div =2 ; -#endif int ddr_pre_div = mmc->ddr_mode ?2 :1 ;int sdhc_clk = priv->sdhc_clk;uint clk;
@@ -639,21 +527,13 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) clk = (pre_div <<8 ) | (div <<4 ); -#ifdef CONFIG_FSL_USDHC -esdhc_clrbits32 (®s->vendorspec,VENDORSPEC_CKEN ); -#else esdhc_clrbits32 (®s->sysctl,SYSCTL_CKEN ); -#endif esdhc_clrsetbits32 (®s->sysctl,SYSCTL_CLOCK_MASK , clk);udelay (10000 ); -#ifdef CONFIG_FSL_USDHC -esdhc_setbits32 (®s->vendorspec,VENDORSPEC_PEREN |VENDORSPEC_CKEN ); -#else esdhc_setbits32 (®s->sysctl,SYSCTL_PEREN |SYSCTL_CKEN ); -#endif priv->clock = clock; }
@@ -687,317 +567,20 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) }#endif -#ifdef MMC_SUPPORTS_TUNING -static int esdhc_change_pinstate (struct udevice *dev) -{ -struct fsl_esdhc_priv *priv =dev_get_priv (dev); -int ret; - -switch (priv->mode) { -case UHS_SDR50 : -case UHS_DDR50 : - ret =pinctrl_select_state (dev,"state_100mhz" ); -break ; -case UHS_SDR104 : -case MMC_HS_200 : -case MMC_HS_400 : - ret =pinctrl_select_state (dev,"state_200mhz" ); -break ; -default : - ret =pinctrl_select_state (dev,"default" ); -break ; - } - -if (ret) -printf ("%s %d error\n" , __func__, priv->mode); - -return ret; -} - -static void esdhc_reset_tuning (struct mmc *mmc) -{ -struct fsl_esdhc_priv *priv =dev_get_priv (mmc->dev); -struct fsl_esdhc *regs = priv->esdhc_regs; - -if (priv->flags &ESDHC_FLAG_USDHC ) { -if (priv->flags &ESDHC_FLAG_STD_TUNING ) { -esdhc_clrbits32 (®s->autoc12err, -MIX_CTRL_SMPCLK_SEL | -MIX_CTRL_EXE_TUNE ); - } - } -} - -static void esdhc_set_strobe_dll (struct mmc *mmc) -{ -struct fsl_esdhc_priv *priv =dev_get_priv (mmc->dev); -struct fsl_esdhc *regs = priv->esdhc_regs; -u32 val; - -if (priv->clock >ESDHC_STROBE_DLL_CLK_FREQ ) { -writel (ESDHC_STROBE_DLL_CTRL_RESET , ®s->strobe_dllctrl); - -/* -* enable strobe dll ctrl and adjust the delay target -* for the uSDHC loopback read clock -*/ - val =ESDHC_STROBE_DLL_CTRL_ENABLE | - (priv->strobe_dll_delay_target << -ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_SHIFT ); -writel (val, ®s->strobe_dllctrl); -/* wait 1us to make sure strobe dll status register stable */ -mdelay (1 ); - val =readl (®s->strobe_dllstat); -if (!(val &ESDHC_STROBE_DLL_STS_REF_LOCK )) -pr_warn ("HS400 strobe DLL status REF not lock!\n" ); -if (!(val &ESDHC_STROBE_DLL_STS_SLV_LOCK )) -pr_warn ("HS400 strobe DLL status SLV not lock!\n" ); - } -} - -static int esdhc_set_timing (struct mmc *mmc) -{ -struct fsl_esdhc_priv *priv =dev_get_priv (mmc->dev); -struct fsl_esdhc *regs = priv->esdhc_regs; -u32 mixctrl; - - mixctrl =readl (®s->mixctrl); - mixctrl &= ~(MIX_CTRL_DDREN |MIX_CTRL_HS400_EN ); - -switch (mmc->selected_mode) { -case MMC_LEGACY : -case SD_LEGACY : -esdhc_reset_tuning (mmc); -writel (mixctrl, ®s->mixctrl); -break ; -case MMC_HS_400 : - mixctrl |=MIX_CTRL_DDREN |MIX_CTRL_HS400_EN ; -writel (mixctrl, ®s->mixctrl); -esdhc_set_strobe_dll (mmc); -break ; -case MMC_HS : -case MMC_HS_52 : -case MMC_HS_200 : -case SD_HS : -case UHS_SDR12 : -case UHS_SDR25 : -case UHS_SDR50 : -case UHS_SDR104 : -writel (mixctrl, ®s->mixctrl); -break ; -case UHS_DDR50 : -case MMC_DDR_52 : - mixctrl |=MIX_CTRL_DDREN ; -writel (mixctrl, ®s->mixctrl); -break ; -default : -printf ("Not supported %d\n" , mmc->selected_mode); -return -EINVAL ; - } - - priv->mode = mmc->selected_mode; - -return esdhc_change_pinstate (mmc->dev); -} - -static int esdhc_set_voltage (struct mmc *mmc) -{ -struct fsl_esdhc_priv *priv =dev_get_priv (mmc->dev); -struct fsl_esdhc *regs = priv->esdhc_regs; -int ret; - - priv->signal_voltage = mmc->signal_voltage; -switch (mmc->signal_voltage) { -case MMC_SIGNAL_VOLTAGE_330 : -if (priv->vs18_enable) -return -EIO ; -#if CONFIG_IS_ENABLED (DM_REGULATOR ) -if (!IS_ERR_OR_NULL (priv->vqmmc_dev)) { - ret =regulator_set_value (priv->vqmmc_dev,3300000 ); -if (ret) { -printf ("Setting to 3.3V error" ); -return -EIO ; - } -/* Wait for 5ms */ -mdelay (5 ); - } -#endif - -esdhc_clrbits32 (®s->vendorspec,ESDHC_VENDORSPEC_VSELECT ); -if (!(esdhc_read32 (®s->vendorspec) & -ESDHC_VENDORSPEC_VSELECT )) -return 0 ; - -return -EAGAIN ; -case MMC_SIGNAL_VOLTAGE_180 : -#if CONFIG_IS_ENABLED (DM_REGULATOR ) -if (!IS_ERR_OR_NULL (priv->vqmmc_dev)) { - ret =regulator_set_value (priv->vqmmc_dev,1800000 ); -if (ret) { -printf ("Setting to 1.8V error" ); -return -EIO ; - } - } -#endif -esdhc_setbits32 (®s->vendorspec,ESDHC_VENDORSPEC_VSELECT ); -if (esdhc_read32 (®s->vendorspec) &ESDHC_VENDORSPEC_VSELECT ) -return 0 ; - -return -EAGAIN ; -case MMC_SIGNAL_VOLTAGE_120 : -return -ENOTSUPP ; -default : -return 0 ; - } -} - -static void esdhc_stop_tuning (struct mmc *mmc) -{ -struct mmc_cmd cmd; - - cmd.cmdidx =MMC_CMD_STOP_TRANSMISSION ; - cmd.cmdarg =0 ; - cmd.resp_type = MMC_RSP_R1b; - -dm_mmc_send_cmd (mmc->dev, &cmd,NULL ); -} - -static int fsl_esdhc_execute_tuning (struct udevice *dev,uint32_t opcode) -{ -struct fsl_esdhc_plat *plat =dev_get_platdata (dev); -struct fsl_esdhc_priv *priv =dev_get_priv (dev); -struct fsl_esdhc *regs = priv->esdhc_regs; -struct mmc *mmc = &plat->mmc; -u32 irqstaten =readl (®s->irqstaten); -u32 irqsigen =readl (®s->irqsigen); -int i, ret = -ETIMEDOUT ; -u32 val, mixctrl; - -/* clock tuning is not needed for upto 52MHz */ -if (mmc->clock <=52000000 ) -return 0 ; - -/* This is readw/writew SDHCI_HOST_CONTROL2 when tuning */ -if (priv->flags &ESDHC_FLAG_STD_TUNING ) { - val =readl (®s->autoc12err); - mixctrl =readl (®s->mixctrl); - val &= ~MIX_CTRL_SMPCLK_SEL ; - mixctrl &= ~(MIX_CTRL_FBCLK_SEL |MIX_CTRL_AUTO_TUNE_EN ); - - val |=MIX_CTRL_EXE_TUNE ; - mixctrl |=MIX_CTRL_FBCLK_SEL |MIX_CTRL_AUTO_TUNE_EN ; - -writel (val, ®s->autoc12err); -writel (mixctrl, ®s->mixctrl); - } - -/* sdhci_writew(host, SDHCI_TRNS_READ, SDHCI_TRANSFER_MODE); */ - mixctrl =readl (®s->mixctrl); - mixctrl =MIX_CTRL_DTDSEL_READ | (mixctrl & ~MIX_CTRL_SDHCI_MASK ); -writel (mixctrl, ®s->mixctrl); - -writel (IRQSTATEN_BRR , ®s->irqstaten); -writel (IRQSTATEN_BRR , ®s->irqsigen); - -/* -* Issue opcode repeatedly till Execute Tuning is set to 0 or the number -* of loops reaches 40 times. -*/ -for (i =0 ; i <MAX_TUNING_LOOP ; i++) { -u32 ctrl; - -if (opcode ==MMC_CMD_SEND_TUNING_BLOCK_HS200 ) { -if (mmc->bus_width ==8 ) -writel (0x7080 , ®s->blkattr); -else if (mmc->bus_width ==4 ) -writel (0x7040 , ®s->blkattr); - }else { -writel (0x7040 , ®s->blkattr); - } - -/* sdhci_writew(host, SDHCI_TRNS_READ, SDHCI_TRANSFER_MODE) */ - val =readl (®s->mixctrl); - val =MIX_CTRL_DTDSEL_READ | (val & ~MIX_CTRL_SDHCI_MASK ); -writel (val, ®s->mixctrl); - -/* We are using STD tuning, no need to check return value */ -mmc_send_tuning (mmc, opcode,NULL ); - - ctrl =readl (®s->autoc12err); -if ((!(ctrl &MIX_CTRL_EXE_TUNE )) && - (ctrl &MIX_CTRL_SMPCLK_SEL )) { -/* -* need to wait some time, make sure sd/mmc fininsh -* send out tuning data, otherwise, the sd/mmc can't -* response to any command when the card still out -* put the tuning data. -*/ -mdelay (1 ); - ret =0 ; -break ; - } - -/* Add 1ms delay for SD and eMMC */ -mdelay (1 ); - } - -writel (irqstaten, ®s->irqstaten); -writel (irqsigen, ®s->irqsigen); - -esdhc_stop_tuning (mmc); - -return ret; -} -#endif -static int esdhc_set_ios_common (struct fsl_esdhc_priv *priv,struct mmc *mmc) {struct fsl_esdhc *regs = priv->esdhc_regs; -int ret__maybe_unused ;#ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK /* Select to use peripheral clock */ esdhc_clock_control (priv, false); -esdhc_setbits32 (®s->scr,ESDHCCTL_PCS ); +esdhc_setbits32 (®s->esdhcctl,ESDHCCTL_PCS );esdhc_clock_control (priv, true);#endif /* Set the clock speed */ if (priv->clock != mmc->clock)set_sysctl (priv, mmc, mmc->clock); -#ifdef MMC_SUPPORTS_TUNING -if (mmc->clk_disable) { -#ifdef CONFIG_FSL_USDHC -esdhc_clrbits32 (®s->vendorspec,VENDORSPEC_CKEN ); -#else -esdhc_clrbits32 (®s->sysctl,SYSCTL_CKEN ); -#endif - }else { -#ifdef CONFIG_FSL_USDHC -esdhc_setbits32 (®s->vendorspec,VENDORSPEC_PEREN | -VENDORSPEC_CKEN ); -#else -esdhc_setbits32 (®s->sysctl,SYSCTL_PEREN |SYSCTL_CKEN ); -#endif - } - -if (priv->mode != mmc->selected_mode) { - ret =esdhc_set_timing (mmc); -if (ret) { -printf ("esdhc_set_timing error %d\n" , ret); -return ret; - } - } - -if (priv->signal_voltage != mmc->signal_voltage) { - ret =esdhc_set_voltage (mmc); -if (ret) { -printf ("esdhc_set_voltage error %d\n" , ret); -return ret; - } - } -#endif -/* Set the bus width */ esdhc_clrbits32 (®s->proctl,PROCTL_DTW_4 |PROCTL_DTW_8 );
@@ -1024,34 +607,10 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)return -ETIMEDOUT ; } -#if defined(CONFIG_FSL_USDHC ) -/* RSTA doesn't reset MMC_BOOT register, so manually reset it */ -esdhc_write32 (®s->mmcboot,0x0 ); -/* Reset MIX_CTRL and CLK_TUNE_CTRL_STATUS regs to 0 */ -esdhc_write32 (®s->mixctrl,0x0 ); -esdhc_write32 (®s->clktunectrlstatus,0x0 ); - -/* Put VEND_SPEC to default value */ -if (priv->vs18_enable) -esdhc_write32 (®s->vendorspec, (VENDORSPEC_INIT | -ESDHC_VENDORSPEC_VSELECT )); -else -esdhc_write32 (®s->vendorspec,VENDORSPEC_INIT ); - -/* Disable DLL_CTRL delay line */ -esdhc_write32 (®s->dllctrl,0x0 ); -#endif - -#ifndef ARCH_MXC /* Enable cache snooping */ -esdhc_write32 (®s->scr,0x00000040 ); -#endif +esdhc_write32 (®s->esdhcctl,0x00000040 ); -#ifndef CONFIG_FSL_USDHC esdhc_setbits32 (®s->sysctl,SYSCTL_HCKEN |SYSCTL_IPGEN ); -#else -esdhc_setbits32 (®s->vendorspec,VENDORSPEC_HCKEN |VENDORSPEC_IPGEN ); -#endif /* Set the initial clock speed */ mmc_set_clock (mmc,400000 ,MMC_CLK_ENABLE );
@@ -1059,12 +618,8 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)/* Disable the BRR and BWR bits in IRQSTAT */ esdhc_clrbits32 (®s->irqstaten,IRQSTATEN_BRR |IRQSTATEN_BWR ); -#ifdef CONFIG_MCF5441x -esdhc_write32 (®s->proctl,PROCTL_INIT |PROCTL_D3CD ); -#else /* Put the PROCTL reg back to the default */ esdhc_write32 (®s->proctl,PROCTL_INIT ); -#endif /* Set timout to the maximum value */ esdhc_clrsetbits32 (®s->sysctl,SYSCTL_TIMEOUT_MASK ,14 <<16 );
@@ -1085,10 +640,6 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv *priv)#if CONFIG_IS_ENABLED (DM_MMC )if (priv->non_removable)return 1 ; -#ifdef CONFIG_DM_GPIO -if (dm_gpio_is_valid (&priv->cd_gpio)) -return dm_gpio_get_value (&priv->cd_gpio); -#endif #endif while (!(esdhc_read32 (®s->prsstat) &PRSSTAT_CINS ) && --timeout)
@@ -1172,25 +723,8 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv,if (ret)return ret; -#ifdef CONFIG_MCF5441x -/* ColdFire, using SDHC_DATA[3] for card detection */ -esdhc_write32 (®s->proctl,PROCTL_INIT |PROCTL_D3CD ); -#endif - -#ifndef CONFIG_FSL_USDHC -esdhc_setbits32 (®s->sysctl,SYSCTL_PEREN |SYSCTL_HCKEN - |SYSCTL_IPGEN |SYSCTL_CKEN ); -/* Clearing tuning bits in case ROM has set it already */ -esdhc_write32 (®s->mixctrl,0 ); -esdhc_write32 (®s->autoc12err,0 ); -esdhc_write32 (®s->clktunectrlstatus,0 ); -#else -esdhc_setbits32 (®s->vendorspec,VENDORSPEC_PEREN | -VENDORSPEC_HCKEN |VENDORSPEC_IPGEN |VENDORSPEC_CKEN ); -#endif - -if (priv->vs18_enable) -esdhc_setbits32 (®s->vendorspec,ESDHC_VENDORSPEC_VSELECT ); +esdhc_setbits32 (®s->sysctl,SYSCTL_PEREN |SYSCTL_HCKEN | +SYSCTL_IPGEN |SYSCTL_CKEN );writel (SDHCI_IRQ_EN_BITS , ®s->irqstaten); cfg = &plat->cfg;
@@ -1201,15 +735,6 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, voltage_caps =0 ; caps =esdhc_read32 (®s->hostcapblt); -#ifdef CONFIG_MCF5441x -/* -* MCF5441x RM declares in more points that sdhc clock speed must -* never exceed 25 Mhz. From this, the HS bit needs to be disabled -* from host capabilities. -*/ - caps &= ~ESDHC_HOSTCAPBLT_HSS ; -#endif -#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC135 caps = caps & ~(ESDHC_HOSTCAPBLT_SRS |ESDHC_HOSTCAPBLT_VS18 |ESDHC_HOSTCAPBLT_VS30 );
@@ -1266,27 +791,11 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, cfg->host_caps &= ~MMC_MODE_8BIT ;#endif - cfg->host_caps |= priv->caps; - cfg->f_min =400000 ; cfg->f_max =min (priv->sdhc_clk, (u32 )200000000 ); cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; -writel (0 , ®s->dllctrl); -if (priv->flags &ESDHC_FLAG_USDHC ) { -if (priv->flags &ESDHC_FLAG_STD_TUNING ) { -u32 val =readl (®s->tuning_ctrl); - - val |=ESDHC_STD_TUNING_EN ; - val &= ~ESDHC_TUNING_START_TAP_MASK ; - val |= priv->tuning_start_tap; - val &= ~ESDHC_TUNING_STEP_MASK ; - val |= (priv->tuning_step) <<ESDHC_TUNING_STEP_SHIFT ; -writel (val, ®s->tuning_ctrl); - } - } -return 0 ; }
@@ -1301,7 +810,6 @@ static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg, priv->bus_width = cfg->max_bus_width; priv->sdhc_clk = cfg->sdhc_clk; priv->wp_enable = cfg->wp_enable; - priv->vs18_enable = cfg->vs18_enable;return 0 ; };
@@ -1438,22 +946,11 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd)#ifndef CONFIG_PPC #include <asm/arch/clock.h> #endif -__weak void init_clk_usdhc (u32 index) -{ -} -static int fsl_esdhc_probe (struct udevice *dev) {struct mmc_uclass_priv *upriv =dev_get_uclass_priv (dev);struct fsl_esdhc_plat *plat =dev_get_platdata (dev);struct fsl_esdhc_priv *priv =dev_get_priv (dev); -const void *fdt = gd->fdt_blob; -int node =dev_of_offset (dev); -struct esdhc_soc_data *data = - (struct esdhc_soc_data *)dev_get_driver_data (dev); -#if CONFIG_IS_ENABLED (DM_REGULATOR ) -struct udevice *vqmmc_dev; -#endif fdt_addr_t addr;unsigned int val;struct mmc *mmc;
@@ -1468,11 +965,6 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->esdhc_regs = (struct fsl_esdhc *)addr;#endif priv->dev = dev; - priv->mode =-1 ; -if (data) { - priv->flags = data->flags; - priv->caps = data->caps; - } val =dev_read_u32_default (dev,"bus-width" ,-1 );if (val ==8 )
@@ -1482,81 +974,13 @@ static int fsl_esdhc_probe(struct udevice *dev)else priv->bus_width =1 ; - val =fdtdec_get_int (fdt, node,"fsl,tuning-step" ,1 ); - priv->tuning_step = val; - val =fdtdec_get_int (fdt, node,"fsl,tuning-start-tap" , -ESDHC_TUNING_START_TAP_DEFAULT ); - priv->tuning_start_tap = val; - val =fdtdec_get_int (fdt, node,"fsl,strobe-dll-delay-target" , -ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_DEFAULT ); - priv->strobe_dll_delay_target = val; -if (dev_read_bool (dev,"non-removable" )) { priv->non_removable =1 ; }else { priv->non_removable =0 ; -#ifdef CONFIG_DM_GPIO -gpio_request_by_name (dev,"cd-gpios" ,0 , &priv->cd_gpio, -GPIOD_IS_IN ); -#endif } -if (dev_read_prop (dev,"fsl,wp-controller" ,NULL )) { - priv->wp_enable =1 ; - }else { - priv->wp_enable =0 ; -#ifdef CONFIG_DM_GPIO -gpio_request_by_name (dev,"wp-gpios" ,0 , &priv->wp_gpio, -GPIOD_IS_IN ); -#endif - } - - priv->vs18_enable =0 ; - -#if CONFIG_IS_ENABLED (DM_REGULATOR ) -/* -* If emmc I/O has a fixed voltage at 1.8V, this must be provided, -* otherwise, emmc will work abnormally. -*/ - ret =device_get_supply_regulator (dev,"vqmmc-supply" , &vqmmc_dev); -if (ret) { -dev_dbg (dev,"no vqmmc-supply\n" ); - }else { - ret =regulator_set_enable (vqmmc_dev, true); -if (ret) { -dev_err (dev,"fail to enable vqmmc-supply\n" ); -return ret; - } - -if (regulator_get_value (vqmmc_dev) ==1800000 ) - priv->vs18_enable =1 ; - } -#endif - -if (fdt_get_property (fdt, node,"no-1-8-v" ,NULL )) - priv->caps &= ~(UHS_CAPS |MMC_MODE_HS200 |MMC_MODE_HS400 ); - -/* -* TODO: -* Because lack of clk driver, if SDHC clk is not enabled, -* need to enable it first before this driver is invoked. -* -* we use MXC_ESDHC_CLK to get clk freq. -* If one would like to make this function work, -* the aliases should be provided in dts as this: -* -* aliases { -* mmc0 = &usdhc1; -* mmc1 = &usdhc2; -* mmc2 = &usdhc3; -* mmc3 = &usdhc4; -* }; -* Then if your board only supports mmc2 and mmc3, but we can -* correctly get the seq as 2 and 3, then let mxc_get_clock -* work as expected. -*/ - -init_clk_usdhc (dev->seq); + priv->wp_enable =1 ;if (IS_ENABLED (CONFIG_CLK )) {/* Assigned clock already set clock */
@@ -1627,28 +1051,10 @@ static const struct dm_mmc_ops fsl_esdhc_ops = { .get_cd = fsl_esdhc_get_cd, .send_cmd = fsl_esdhc_send_cmd, .set_ios = fsl_esdhc_set_ios, -#ifdef MMC_SUPPORTS_TUNING - .execute_tuning = fsl_esdhc_execute_tuning, -#endif };#endif -static struct esdhc_soc_data usdhc_imx7d_data = { - .flags =ESDHC_FLAG_USDHC |ESDHC_FLAG_STD_TUNING - |ESDHC_FLAG_HAVE_CAP1 |ESDHC_FLAG_HS200 - |ESDHC_FLAG_HS400 , - .caps =UHS_CAPS |MMC_MODE_HS200 | MMC_MODE_DDR_52MHz | - MMC_MODE_HS_52MHz |MMC_MODE_HS , -}; -static const struct udevice_id fsl_esdhc_ids[] = { - { .compatible ="fsl,imx53-esdhc" , }, - { .compatible ="fsl,imx6ul-usdhc" , }, - { .compatible ="fsl,imx6sx-usdhc" , }, - { .compatible ="fsl,imx6sl-usdhc" , }, - { .compatible ="fsl,imx6q-usdhc" , }, - { .compatible ="fsl,imx7d-usdhc" , .data = (ulong)&usdhc_imx7d_data,}, - { .compatible ="fsl,imx7ulp-usdhc" , }, { .compatible ="fsl,esdhc" , }, {/* sentinel */ } };
include/fsl_esdhc.h +0 -57
83 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v6 5/5 mmc: fsl_esdhc_imx: drop useless code
In reply to Yangbo LuDropped useless code for i.MX eSDHC driver.
---
Changes for v2:
- Added this patch.
Changes for v3:
- None.
Changes for v4:
- Dropped PPC code introduced recently.
Changes for v5:
- Kept MCF5441x code.
Changes for v6:
- None.
--- drivers/mmc/fsl_esdhc_imx.c | 65 +++------------------------------------------ include/fsl_esdhc_imx.h | 4 --- 2 files changed, 4 insertions(+), 65 deletions(-)
drivers/mmc/fsl_esdhc_imx.c +4 -61
@@ -261,8 +261,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, {int timeout;struct fsl_esdhc *regs = priv->esdhc_regs; -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234 ) || defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M )dma_addr_t addr;#endif uint wml_value;
@@ -275,8 +274,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,esdhc_clrsetbits32 (®s->wml,WML_RD_WML_MASK , wml_value);#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234 ) || defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) addr =virt_to_phys ((void *)(data->dest));if (upper_32_bits (addr))printf ("Error found for upper 32 bits\n" );
@@ -312,8 +310,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,esdhc_clrsetbits32 (®s->wml,WML_WR_WML_MASK , wml_value <<16 );#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234 ) || defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) addr =virt_to_phys ((void *)(data->src));if (upper_32_bits (addr))printf ("Error found for upper 32 bits\n" );
@@ -378,8 +375,7 @@ static void check_and_invalidate_dcache_rangeunsigned end =0 ;unsigned size =roundup (ARCH_DMA_MINALIGN , data->blocks*data->blocksize); -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234 ) || defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M )dma_addr_t addr; addr =virt_to_phys ((void *)(data->dest));
@@ -1364,45 +1360,6 @@ int fsl_esdhc_mmc_init(bd_t *bis) }#endif -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -void mmc_adapter_card_type_ident (void ) -{ -u8 card_id; -u8 value; - - card_id =QIXIS_READ (present) &QIXIS_SDID_MASK ; - gd->arch.sdhc_adapter = card_id; - -switch (card_id) { -case QIXIS_ESDHC_ADAPTER_TYPE_EMMC45 : - value =QIXIS_READ (brdcfg[5 ]); - value |= (QIXIS_DAT4 |QIXIS_DAT5_6_7 ); -QIXIS_WRITE (brdcfg[5 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_SDMMC_LEGACY : - value =QIXIS_READ (pwr_ctl[1 ]); - value |=QIXIS_EVDD_BY_SDHC_VS ; -QIXIS_WRITE (pwr_ctl[1 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_EMMC44 : - value =QIXIS_READ (brdcfg[5 ]); - value |= (QIXIS_SDCLKIN |QIXIS_SDCLKOUT ); -QIXIS_WRITE (brdcfg[5 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_RSV : -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_MMC : -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_SD : -break ; -case QIXIS_ESDHC_NO_ADAPTER : -break ; -default : -break ; - } -} -#endif -#ifdef CONFIG_OF_LIBFDT __weak int esdhc_status_fixup (void *blob,const char *compat) {
@@ -1430,17 +1387,11 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd)do_fixup_by_compat_u32 (blob, compat,"clock-frequency" , gd->arch.sdhc_clk,1 ); #endif -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -do_fixup_by_compat_u32 (blob, compat,"adapter-type" , - (u32)(gd->arch.sdhc_adapter),1 ); -#endif }#endif #if CONFIG_IS_ENABLED (DM_MMC ) -#ifndef CONFIG_PPC #include <asm/arch/clock.h> -#endif __weak void init_clk_usdhc (u32 index) { }
@@ -1465,11 +1416,7 @@ static int fsl_esdhc_probe(struct udevice *dev) addr =dev_read_addr (dev);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ; -#ifdef CONFIG_PPC - priv->esdhc_regs = (struct fsl_esdhc *)lower_32_bits (addr); -#else priv->esdhc_regs = (struct fsl_esdhc *)addr; -#endif priv->dev = dev; priv->mode =-1 ;if (data) {
@@ -1576,11 +1523,7 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->sdhc_clk =clk_get_rate (&priv->per_clk); }else { -#ifndef CONFIG_PPC priv->sdhc_clk =mxc_get_clock (MXC_ESDHC_CLK + dev->seq); -#else - priv->sdhc_clk = gd->arch.sdhc_clk; -#endif if (priv->sdhc_clk <=0 ) {dev_err (dev,"Unable to get clk for %s\n" , dev->name);return -EINVAL ;
include/fsl_esdhc_imx.h +0 -4
@@ -19,10 +19,6 @@/* needed for the mmc_cfg definition */ #include <mmc.h> -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -#include "../board/freescale/common/qixis.h" -#endif -/* FSL eSDHC-specific constants */ #define SYSCTL 0x0002e02c#define SYSCTL_INITA 0x08000000
Signature · 1 line
2.7.4
PATCH v6 5/5 mmc: fsl_esdhc_imx: drop useless code
Quoted 159 lines · On Wed, 19 Jun 2019 12:24:30 +0800 Yangbo Lu <[email protected]> wrote:
Dropped useless code for i.MX eSDHC driver.
Signed-off-by Yangbo Lu <[email protected]>Tested-by Steffen Dirkwinkel <[email protected]>Reviewed-by Peng Fan <[email protected]>---
Changes for v2:
- Added this patch.
Changes for v3:
- None.
Changes for v4:
- Dropped PPC code introduced recently.
Changes for v5:
- Kept MCF5441x code.
Changes for v6:
- None.--- drivers/mmc/fsl_esdhc_imx.c | 65+++------------------------------------------
include/fsl_esdhc_imx.h| 4 --- 2 files changed, 4
insertions(+), 65 deletions(-)drivers/mmc/fsl_esdhc_imx.c +1
-2@@ -261,8 +261,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, {int timeout;struct fsl_esdhc *regs = priv->esdhc_regs; -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) dma_addr_t addr;#endif uint wml_value;@@ -275,8 +274,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK,
wml_value); #ifndefCONFIG_SYS_FSL_ESDHC_USE_PIOdrivers/mmc/fsl_esdhc_imx.c +1
-2-#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||
defined(CONFIG_IMX8M)addr =virt_to_phys((void *)(data->dest));drivers/mmc/fsl_esdhc_imx.c +2
-54if (upper_32_bits (addr))printf ("Error found for upper 32 bits\n" );@@ -312,8 +310,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml,WML_WR_WML_MASK , wml_value <<16 );#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234 ) || defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M) addr = virt_to_phys((void *)(data->src)); if (upper_32_bits(addr))printf ("Error found for upper 32 bits\n" );@@ -378,8 +375,7 @@ static void check_and_invalidate_dcache_rangeunsigned end =0 ;unsigned size =roundup (ARCH_DMA_MINALIGN , data->blocks*data->blocksize); -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) dma_addr_t addr; addr =virt_to_phys ((void *)(data->dest));@@ -1364,45 +1360,6 @@ int fsl_esdhc_mmc_init(bd_t *bis) }#endif -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -void mmc_adapter_card_type_ident (void ) -{ -u8 card_id; -u8 value; - - card_id =QIXIS_READ (present) &QIXIS_SDID_MASK ; - gd->arch.sdhc_adapter = card_id; - -switch (card_id) { -case QIXIS_ESDHC_ADAPTER_TYPE_EMMC45 : - value =QIXIS_READ (brdcfg[5 ]); - value |= (QIXIS_DAT4 |QIXIS_DAT5_6_7 ); -QIXIS_WRITE (brdcfg[5 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_SDMMC_LEGACY : - value =QIXIS_READ (pwr_ctl[1 ]); - value |=QIXIS_EVDD_BY_SDHC_VS ; -QIXIS_WRITE (pwr_ctl[1 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_EMMC44 : - value =QIXIS_READ (brdcfg[5 ]); - value |= (QIXIS_SDCLKIN |QIXIS_SDCLKOUT ); -QIXIS_WRITE (brdcfg[5 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_RSV : -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_MMC : -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_SD : -break ; -case QIXIS_ESDHC_NO_ADAPTER : -break ; -default : -break ; - } -} -#endif -#ifdef CONFIG_OF_LIBFDT __weak int esdhc_status_fixup (void *blob,const char *compat) {@@ -1430,17 +1387,11 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd)do_fixup_by_compat_u32 (blob, compat,"clock-frequency" , gd->arch.sdhc_clk,1 ); #endif -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -do_fixup_by_compat_u32 (blob, compat,"adapter-type" , - (u32)(gd->arch.sdhc_adapter),1 ); -#endif }#endif #if CONFIG_IS_ENABLED (DM_MMC ) -#ifndef CONFIG_PPC #include <asm/arch/clock.h> -#endif __weak void init_clk_usdhc (u32 index) { }@@ -1465,11 +1416,7 @@ static int fsl_esdhc_probe(struct udevice *dev) addr =dev_read_addr (dev);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ; -#ifdef CONFIG_PPC - priv->esdhc_regs = (struct fsl_esdhc *)lower_32_bits (addr); -#else priv->esdhc_regs = (struct fsl_esdhc *)addr; -#endif priv->dev = dev; priv->mode =-1 ;if (data) {@@ -1576,11 +1523,7 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->sdhc_clk =clk_get_rate (&priv->per_clk); }else { -#ifndef CONFIG_PPC priv->sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK +
dev->seq); -#elsedrivers/mmc/fsl_esdhc_imx.c +0
-2- priv->sdhc_clk = gd->arch.sdhc_clk; -#endif if (priv->sdhc_clk <=0 ) { dev_err(dev, "Unable to get clk for %s\n",
dev->name); return-EINVAL;include/fsl_esdhc_imx.h +0
-0
include/fsl_esdhc_imx.h line 24
Quoted 10 lines
include/fsl_esdhc_imx.h +0
-4@@ -19,10 +19,6 @@/* needed for the mmc_cfg definition */ #include <mmc.h> -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -#include "../board/freescale/common/qixis.h" -#endif -/* FSL eSDHC-specific constants */ #define SYSCTL 0x0002e02c#define SYSCTL_INITA 0x08000000
Thanks for cleaning up this driver. Splitting it will definitely make maintenance easier in the future.
Just one more request - as this patch is quite intrusive.
I suppose that you tested it on all archs with Travis-CI?
Also, even more important - have you used buildman tool:
./tools/buildman/buildman.py --branch=HEAD imx --show_errors --force-build --count=5 --output-dir=../BUILD/
where the imx covers all the i.MX machines (you can also used only e.g. mx6 or qoriq).
This will check if the U-Boot builds after applying each commit, which is important for bisecting.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190619/82de438f/attachment.sig>
PATCH v6 5/5 mmc: fsl_esdhc_imx: drop useless code
Quoted 217 lines
-----Original Message-----
From: Lukasz Majewski <[email protected]>
Sent: 2019年6月19日 14:48
To: Y.b. Lu <[email protected]>
Cc: u-boot at lists.denx.de; Stefano Babic <[email protected]>; Fabio Estevam <[email protected]>; dl-uboot-imx <[email protected]>; Albert Aribaud <[email protected]>; Eddy Petrișor <[email protected]>; Akshay Bhat <[email protected]>; Ken Lin <[email protected]>; Heiko Schocher <[email protected]>; Christian Gmeiner <[email protected]>; Stefan Roese <[email protected]>; Patrick Bruenn <[email protected]>; Troy Kisky <[email protected]>; Uri Mashiach <[email protected]>; Nikita Kiryanov <[email protected]>; Otavio Salvador <[email protected]>; Andreas Geisreiter <[email protected]>; Ludwig Zenz <[email protected]>; Peng Fan <[email protected]>; Jason Liu <[email protected]>; Ye Li <[email protected]>; Adrian Alonso <[email protected]>; Alison Wang <[email protected]>; tharvey at gateworks.com; Ian Ray <[email protected]>; Marcin Niestroj <[email protected]>; Andrej Rosano <[email protected]>; Marek Vasut <[email protected]>; Adam Ford <[email protected]>; Olaf Mandel <[email protected]>; Martyn Welch <[email protected]>; Ingo Schroeck <[email protected]>; Soeren Moch <[email protected]>; Richard Hu <[email protected]>; Vanessa Maegima <[email protected]>; Max Krummenacher <[email protected]>; Stefan Agner <[email protected]>; Markus Niebel <[email protected]>; Breno Matheus Lima <[email protected]>; Francesco Montefoschi <[email protected]>; Parthiban Nallathambi <[email protected]>; Albert ARIBAUD <[email protected]>; Jagan Teki <[email protected]>; Raffaele RECALCATI <[email protected]>; Simone CIANNI <[email protected]>; Bhaskar Upadhaya <[email protected]>; Prabhakar Kushwaha <[email protected]>; Rajesh Bhagat <[email protected]>; Antti Mäentausta <[email protected]>
Subject: Re: [v6, 5/5] mmc:fsl_esdhc_imx: drop useless codeQuoted 36 lines · On Wed, 19 Jun 2019 12:24:30 +0800 Yangbo Lu <[email protected]> wrote:
Dropped useless code for i.MX eSDHC driver.
Signed-off-by Yangbo Lu <[email protected]>Tested-by Steffen Dirkwinkel <[email protected]>Reviewed-by Peng Fan <[email protected]>---
Changes for v2:
- Added this patch.
Changes for v3:
- None.
Changes for v4:
- Dropped PPC code introduced recently.
Changes for v5:
- Kept MCF5441x code.
Changes for v6:
- None.--- drivers/mmc/fsl_esdhc_imx.c | 65+++------------------------------------------
include/fsl_esdhc_imx.h| 4 --- 2 files changed, 4
insertions(+), 65 deletions(-)drivers/mmc/fsl_esdhc_imx.c +1
-1@@ -261,8 +261,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, {int timeout; struct fsl_esdhc *regs = priv->esdhc_regs; -#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||
defined(CONFIG_IMX8M)dma_addr_taddr; #endifdrivers/mmc/fsl_esdhc_imx.c +0
-0uint wml_value;drivers/mmc/fsl_esdhc_imx.c static int esdhc_setup_data(struct fsl_esdhc_priv · line 275
Quoted 2 lines
drivers/mmc/fsl_esdhc_imx.c +0
-0@@ -275,8 +274,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,esdhc_clrsetbits32 (®s->wml,WML_RD_WML_MASK , wml_value);#ifndef
drivers/mmc/fsl_esdhc_imx.c
Quoted 7 lines
CONFIG_SYS_FSL_ESDHC_USE_PIO-#ifdefined(CONFIG_FSL_LAYERSCAPE)||defined(CONFIG_S32V234)|| \drivers/mmc/fsl_esdhc_imx.c +1
-1-defined (CONFIG_IMX8 ) ||defined (CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||
defined(CONFIG_IMX8M)addr =virt_to_phys((void *)(data->dest));drivers/mmc/fsl_esdhc_imx.c +0
-0if (upper_32_bits (addr)) printf("Error found for upper 32 bits\n"); @@ -312,8 +310,7@@
Quoted 2 lines
static int esdhc_setup_data(struct
fsl_esdhc_priv*priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml,WML_WR_WML_MASK,wml_value<<
drivers/mmc/fsl_esdhc_imx.c
Quoted 7 lines
16); #ifndef
CONFIG_SYS_FSL_ESDHC_USE_PIO-#ifdefined(CONFIG_FSL_LAYERSCAPE)||defined(CONFIG_S32V234)|| \drivers/mmc/fsl_esdhc_imx.c +1
-1-defined (CONFIG_IMX8 ) ||defined (CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||
defined(CONFIG_IMX8M)addr =virt_to_phys((void *)(data->src));drivers/mmc/fsl_esdhc_imx.c +0
-0if (upper_32_bits (addr)) printf("Error found for upper 32 bits\n"); @@ -378,8 +375,7@@
Quoted 100 lines
static void
check_and_invalidate_dcache_rangedrivers/mmc/fsl_esdhc_imx.c +1
-2unsigned end =0 ;unsigned size =roundup (ARCH_DMA_MINALIGN , data->blocks*data->blocksize); -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||
defined(CONFIG_IMX8M)dma_addr_taddr;addr =
virt_to_phys((void *)(data->dest)); @@ -1364,45 +1360,6 @@
intfsl_esdhc_mmc_init(bd_t *bis)} #endif-#ifdef
CONFIG_FSL_ESDHC_ADAPTER_IDENT-voidmmc_adapter_card_type_ident(void)-{drivers/mmc/fsl_esdhc_imx.c +0
-43-u8 card_id; -u8 value; - - card_id =QIXIS_READ (present) &QIXIS_SDID_MASK ; - gd->arch.sdhc_adapter = card_id; - -switch (card_id) { -case QIXIS_ESDHC_ADAPTER_TYPE_EMMC45 : - value =QIXIS_READ (brdcfg[5 ]); - value |= (QIXIS_DAT4 |QIXIS_DAT5_6_7 ); -QIXIS_WRITE (brdcfg[5 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_SDMMC_LEGACY : - value =QIXIS_READ (pwr_ctl[1 ]); - value |=QIXIS_EVDD_BY_SDHC_VS ; -QIXIS_WRITE (pwr_ctl[1 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_EMMC44 : - value =QIXIS_READ (brdcfg[5 ]); - value |= (QIXIS_SDCLKIN |QIXIS_SDCLKOUT ); -QIXIS_WRITE (brdcfg[5 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_RSV : -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_MMC : -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_SD : -break ; -case QIXIS_ESDHC_NO_ADAPTER : -break ; -default : -break ; - } -} -#endif -#ifdef CONFIG_OF_LIBFDT __weak int esdhc_status_fixup(void *blob, const char *compat) { @@ -1430,17 +1387,11 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd)do_fixup_by_compat_u32 (blob, compat,"clock-frequency" , gd->arch.sdhc_clk,1 );#endif -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -do_fixup_by_compat_u32 (blob, compat,"adapter-type" , - (u32)(gd->arch.sdhc_adapter),1 ); -#endif }#endif #if CONFIG_IS_ENABLED (DM_MMC ) -#ifndef CONFIG_PPC #include <asm/arch/clock.h> -#endif __weak void init_clk_usdhc(u32 index) { } @@ -1465,11 +1416,7 @@static int
fsl_esdhc_probe(struct udevice *dev)drivers/mmc/fsl_esdhc_imx.c +0
-4addr =dev_read_addr (dev);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ; -#ifdef CONFIG_PPC - priv->esdhc_regs = (struct fsl_esdhc *)lower_32_bits (addr); -#else priv->esdhc_regs = (struct fsl_esdhc *)addr; -#endif priv->dev = dev; priv->mode =-1 ;if (data) {@@ -1576,11 +1523,7 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->sdhc_clk =clk_get_rate (&priv->per_clk); }else { -#ifndef CONFIG_PPC priv->sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK +
dev->seq); -#elsedrivers/mmc/fsl_esdhc_imx.c +0
-2- priv->sdhc_clk = gd->arch.sdhc_clk; -#endif if (priv->sdhc_clk <=0 ) { dev_err(dev, "Unable to get clk for %s\n",
dev->name); return-EINVAL;include/fsl_esdhc_imx.h index renamed from include/fsl_esdhc_imx.h +0
-067fd289..33c6d52 100644
include/fsl_esdhc_imx.h +0
-1@@ -19,10 +19,6 @@/* needed for the mmc_cfg definition */ #include <mmc.h> -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -#include"
../board/freescale/common/qixis.h"include/fsl_esdhc_imx.h line 24
Quoted 5 lines
include/fsl_esdhc_imx.h +0
-2-#endif -/* FSL eSDHC-specific constants */ #define SYSCTL 0x0002e02c#define SYSCTL_INITA 0x08000000Thanks for cleaning up this driver. Splitting it will definitely make maintenance easier in the future.
Reviewed-by Lukasz Majewski <[email protected]>Just one more request - as this patch is quite intrusive.
I suppose that you tested it on all archs with Travis-CI?
Also, even more important - have you used buildman tool:
Quoted 8 lines
./tools/buildman/buildman.py--branch=HEAD imx --show_errors --force-build --count=5 --output-dir=../BUILD/where the imx covers all the i.MX machines (you can also used only e.g. mx6 or qoriq).
This will check if the U-Boot builds after applying each commit, which is important for bisecting.
[Y.b. Lu] Sorry. I didn’t notice u-boot had been moved to gitlab. I had to rebase it again. I sent out v7. Buildman test seemed to be fine.
$ ./tools/buildman/buildman.py --branch=HEAD imx --show_errors --force-build --count=5 --output-dir=../BUILD/ Building 5 commits for 17 boards (4 threads, 1 job per thread) 50 35 0 /85 imx6ul_geam_nand
And Travis-CI is in progress. I think the result will be fine since I tested for previous version patch-set.
https://travis-ci.org/yangbolu1991/u-boot-test/builds/548009687
Quoted 12 lines
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email:
lukma at denx.de
PATCH v6 5/5 mmc: fsl_esdhc_imx: drop useless code
Quoted 278 lines
-----Original Message-----
From: Y.b. Lu
Sent: 2019年6月20日 11:34
To: Lukasz Majewski <[email protected]>
Cc: u-boot at lists.denx.de; Stefano Babic <[email protected]>; Fabio Estevam <[email protected]>; dl-uboot-imx <[email protected]>; Albert Aribaud <[email protected]>; Eddy Petrișor <[email protected]>; Akshay Bhat <[email protected]>; Ken Lin <[email protected]>; Heiko Schocher <[email protected]>; Christian Gmeiner <[email protected]>; Stefan Roese <[email protected]>; Patrick Bruenn <[email protected]>; Troy Kisky <[email protected]>; Uri Mashiach <[email protected]>; Nikita Kiryanov <[email protected]>; Otavio Salvador <[email protected]>; Andreas Geisreiter <[email protected]>; Ludwig Zenz <[email protected]>; Peng Fan <[email protected]>; Jason Liu <[email protected]>; Ye Li <[email protected]>; Adrian Alonso <[email protected]>; Alison Wang <[email protected]>; tharvey at gateworks.com; Ian Ray <[email protected]>; Marcin Niestroj <[email protected]>; Andrej Rosano <[email protected]>; Marek Vasut <[email protected]>; Adam Ford <[email protected]>; Olaf Mandel <[email protected]>; Martyn Welch <[email protected]>; Ingo Schroeck <[email protected]>; Soeren Moch <[email protected]>; Richard Hu <[email protected]>; Vanessa Maegima <[email protected]>; Max Krummenacher <[email protected]>; Stefan Agner <[email protected]>; Markus Niebel <[email protected]>; Breno Matheus Lima <[email protected]>; Francesco Montefoschi <[email protected]>; Parthiban Nallathambi <[email protected]>; Albert ARIBAUD <[email protected]>; Jagan Teki <[email protected]>; Raffaele RECALCATI <[email protected]>; Simone CIANNI <[email protected]>; Bhaskar Upadhaya <[email protected]>; Prabhakar Kushwaha <[email protected]>; Rajesh Bhagat <[email protected]>; Antti Mäentausta <[email protected]>
Subject: RE: [v6, 5/5] mmc:fsl_esdhc_imx: drop useless codeQuoted 6 lines
-----Original Message-----
From: Lukasz Majewski <[email protected]>
Sent: 2019年6月19日 14:48
To: Y.b. Lu <[email protected]>
Cc: u-boot at lists.denx.de; Stefano Babic <[email protected]>; Fabio Estevam <[email protected]>; dl-uboot-imx <[email protected]>;Albert
Quoted 14 lines
Aribaud <[email protected]>; Eddy Petrișor <[email protected]>; Akshay Bhat <[email protected]>; Ken Lin <[email protected]>; Heiko Schocher <[email protected]>; Christian Gmeiner <[email protected]>; Stefan Roese <[email protected]>; Patrick Bruenn <[email protected]>; Troy Kisky <[email protected]>; Uri Mashiach <[email protected]>; Nikita Kiryanov <[email protected]>; Otavio Salvador <[email protected]>; Andreas Geisreiter <[email protected]>; Ludwig Zenz <[email protected]>; Peng Fan <[email protected]>; Jason Liu <[email protected]>; Ye Li <[email protected]>; Adrian Alonso <[email protected]>; Alison Wang <[email protected]>; tharvey at gateworks.com; Ian Ray <[email protected]>; Marcin Niestroj <[email protected]>; Andrej Rosano <[email protected]>;
Quoted 8 lines
Marek Vasut <[email protected]>; Adam Ford <[email protected]>; Olaf Mandel <[email protected]>; Martyn Welch <[email protected]>; Ingo Schroeck <[email protected]>; Soeren Moch <[email protected]>; Richard Hu <[email protected]>; Vanessa Maegima <[email protected]>; Max Krummenacher <[email protected]>; Stefan Agner <[email protected]>; Markus Niebel <[email protected]>; Breno Matheus Lima
Quoted 35 lines
Francesco Montefoschi <[email protected]>; Parthiban Nallathambi <[email protected]>; Albert ARIBAUD <[email protected]>; Jagan Teki <[email protected]>; Raffaele RECALCATI <[email protected]>; Simone CIANNI <[email protected]>; Bhaskar Upadhaya <[email protected]>; Prabhakar Kushwaha <[email protected]>; Rajesh Bhagat <[email protected]>; Antti Mäentausta <[email protected]>
Subject: Re: [v6, 5/5] mmc:fsl_esdhc_imx: drop useless codeQuoted 22 lines · On Wed, 19 Jun 2019 12:24:30 +0800 Yangbo Lu <[email protected]> wrote:
Dropped useless code for i.MX eSDHC driver.
Signed-off-by Yangbo Lu <[email protected]>Tested-by Steffen Dirkwinkel <[email protected]>Reviewed-by Peng Fan <[email protected]>---
Changes for v2:
- Added this patch.
Changes for v3:
- None.
Changes for v4:
- Dropped PPC code introduced recently.
Changes for v5:
- Kept MCF5441x code.
Changes for v6:
- None.--- drivers/mmc/fsl_esdhc_imx.c | 65+++------------------------------------------
include/fsl_esdhc_imx.h| 4 --- 2 files changed, 4
insertions(+), 65 deletions(-)Quoted 16 lines
Quoted 14 lines
(quoted diff) +0
-0
b/drivers/mmc/fsl_esdhc_imx.cindex 1474e2c..2c0ad18 100644drivers/mmc/fsl_esdhc_imx.c +1
-1@@ -261,8 +261,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, { int timeout; struct fsl_esdhc *regs = priv->esdhc_regs; -#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \ - defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||
defined(CONFIG_IMX8M)dma_addr_taddr; #endifdrivers/mmc/fsl_esdhc_imx.c +0
-0uint wml_value;drivers/mmc/fsl_esdhc_imx.c static int esdhc_setup_data(struct · line 275
Quoted 2 lines
drivers/mmc/fsl_esdhc_imx.c +0
-0@@ -275,8 +274,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK,
wml_value);Quoted 2 lines
#ifndef
Quoted 1 line
drivers/mmc/fsl_esdhc_imx.c +0
-0CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_FSL_LAYERSCAPE)|| > > defined(CONFIG_S32V234) || \ > > - defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) > > +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||Quoted 3 lines
drivers/mmc/fsl_esdhc_imx.c static int esdhc_setup_data(struct · line 279
Quoted 3 lines
drivers/mmc/fsl_esdhc_imx.c +0
-0defined (CONFIG_IMX8M) addr =virt_to_phys ((void *)(data->dest));if (upper_32_bits (addr)) printf("Error found for upper 32 bits\n"); @@ -312,8+310,7
Quoted 3 lines
@@
Quoted 2 lines
static int esdhc_setup_data(struct
fsl_esdhc_priv*priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml,WML_WR_WML_MASK,
wml_valueQuoted 8 lines
<<
drivers/mmc/fsl_esdhc_imx.c
Quoted 7 lines
16); #ifndef
CONFIG_SYS_FSL_ESDHC_USE_PIO-#ifdefined(CONFIG_FSL_LAYERSCAPE)||defined(CONFIG_S32V234)|| \drivers/mmc/fsl_esdhc_imx.c +1
-1-defined (CONFIG_IMX8 ) ||defined (CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||
defined(CONFIG_IMX8M)addr =virt_to_phys((void *)(data->src));drivers/mmc/fsl_esdhc_imx.c +0
-0if (upper_32_bits (addr)) printf("Error found for upper 32 bits\n"); @@ -378,8+375,7
Quoted 11 lines
@@
Quoted 10 lines
static void
check_and_invalidate_dcache_rangedrivers/mmc/fsl_esdhc_imx.c +1
-2unsigned end =0 ;unsigned size =roundup (ARCH_DMA_MINALIGN , data->blocks*data->blocksize); -#if defined(CONFIG_FSL_LAYERSCAPE ) || defined(CONFIG_S32V234 ) || \ - defined(CONFIG_IMX8 ) || defined(CONFIG_IMX8M ) +#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) ||
defined(CONFIG_IMX8M)dma_addr_taddr;addr =
virt_to_phys((void *)(data->dest)); @@ -1364,45 +1360,6@@
Quoted 112 lines
Quoted 91 lines
int
fsl_esdhc_mmc_init(bd_t *bis)} #endif-#ifdef
CONFIG_FSL_ESDHC_ADAPTER_IDENT-voidmmc_adapter_card_type_ident(void)-{drivers/mmc/fsl_esdhc_imx.c +0
-43-u8 card_id; -u8 value; - - card_id =QIXIS_READ (present) &QIXIS_SDID_MASK ; - gd->arch.sdhc_adapter = card_id; - -switch (card_id) { -case QIXIS_ESDHC_ADAPTER_TYPE_EMMC45 : - value =QIXIS_READ (brdcfg[5 ]); - value |= (QIXIS_DAT4 |QIXIS_DAT5_6_7 ); -QIXIS_WRITE (brdcfg[5 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_SDMMC_LEGACY : - value =QIXIS_READ (pwr_ctl[1 ]); - value |=QIXIS_EVDD_BY_SDHC_VS ; -QIXIS_WRITE (pwr_ctl[1 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_EMMC44 : - value =QIXIS_READ (brdcfg[5 ]); - value |= (QIXIS_SDCLKIN |QIXIS_SDCLKOUT ); -QIXIS_WRITE (brdcfg[5 ], value); -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_RSV : -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_MMC : -break ; -case QIXIS_ESDHC_ADAPTER_TYPE_SD : -break ; -case QIXIS_ESDHC_NO_ADAPTER : -break ; -default : -break ; - } -} -#endif -#ifdef CONFIG_OF_LIBFDT __weak int esdhc_status_fixup(void *blob, const char *compat) { @@ -1430,17 +1387,11 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd)do_fixup_by_compat_u32 (blob, compat,"clock-frequency" , gd->arch.sdhc_clk,1 );#endif -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -do_fixup_by_compat_u32 (blob, compat,"adapter-type" , - (u32)(gd->arch.sdhc_adapter),1 ); -#endif }#endif #if CONFIG_IS_ENABLED (DM_MMC ) -#ifndef CONFIG_PPC #include <asm/arch/clock.h> -#endif __weak void init_clk_usdhc(u32 index) { } @@ -1465,11 +1416,7 @@static int
fsl_esdhc_probe(struct udevice *dev)drivers/mmc/fsl_esdhc_imx.c +0
-4addr =dev_read_addr (dev);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ; -#ifdef CONFIG_PPC - priv->esdhc_regs = (struct fsl_esdhc *)lower_32_bits (addr); -#else priv->esdhc_regs = (struct fsl_esdhc *)addr; -#endif priv->dev = dev; priv->mode =-1 ;if (data) {@@ -1576,11 +1523,7 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->sdhc_clk =clk_get_rate (&priv->per_clk); }else { -#ifndef CONFIG_PPC priv->sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK +
dev->seq); -#elsedrivers/mmc/fsl_esdhc_imx.c +0
-2- priv->sdhc_clk = gd->arch.sdhc_clk; -#endif if (priv->sdhc_clk <=0 ) { dev_err(dev, "Unable to get clk for %s\n",
dev->name); return-EINVAL;include/fsl_esdhc_imx.h index renamed from include/fsl_esdhc_imx.h +0
-067fd289..33c6d52 100644
include/fsl_esdhc_imx.h +0
-1@@ -19,10 +19,6 @@/* needed for the mmc_cfg definition */ #include <mmc.h> -#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT -#include"
../board/freescale/common/qixis.h"include/fsl_esdhc_imx.h line 24
Quoted 5 lines
include/fsl_esdhc_imx.h +0
-2-#endif -/* FSL eSDHC-specific constants */ #define SYSCTL 0x0002e02c#define SYSCTL_INITA 0x08000000Thanks for cleaning up this driver. Splitting it will definitely make maintenance easier in the future.
Reviewed-by Lukasz Majewski <[email protected]>Just one more request - as this patch is quite intrusive.
I suppose that you tested it on all archs with Travis-CI?
Also, even more important - have you used buildman tool:
./tools/buildman/buildman.py--branch=HEAD imx --show_errors --force-build
--count=5 --output-dir=../BUILD/Quoted 5 lines
where the imx covers all the i.MX machines (you can also used only e.g. mx6 or qoriq).
This will check if the U-Boot builds after applying each commit, which is important for bisecting.
[Y.b. Lu] Sorry. I didn’t notice u-boot had been moved to gitlab. I had to rebase it again.
I sent out v7. Buildman test seemed to be fine.
Quoted 9 lines
$ ./tools/buildman/buildman.py --branch=HEAD imx --show_errors --force-build --count=5 --output-dir=../BUILD/ Building 5 commits for 17 boards (4 threads, 1 job per thread) 50 35 0 /85 imx6ul_geam_nandAnd Travis-CI is in progress. I think the result will be fine since I tested for previous version patch-set.
https://travis-ci.org/yangbolu1991/u-boot-test/builds/548009687
[Y.b. Lu] Sorry. There are some issues.
I should have noticed several platforms introduced config option in header files but not defconfig.
$ grep -r 'FSL_ESDHC$' include/configs/ include/configs/colibri-imx8x.h:#define CONFIG_FSL_ESDHC include/configs/ls1028a_common.h:#define CONFIG_FSL_ESDHC include/configs/ls1028a_common.h:#define CONFIG_FSL_ESDHC include/configs/apalis-imx8.h:#define CONFIG_FSL_ESDHC
Let me rework the patch-set again ☹
Quoted 14 lines
Quoted 10 lines
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang
Denk
Quoted 3 lines
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email:
lukma at denx.de
v6 cover Split fsl_esdhc driver for i.MX
In reply to Yangbo LuQuoted 15 lines · Yangbo Lu
The
fsl_esdhcdriver was for Freescale eSDHC on MPC83XX/MPC85XX initially. The later QoriQ series PowerPC processors (which were evolutions of MPC83XX/MPC85XX), QorIQ series ARM processors, and i.MX series processors were using this driver for their eSDHCs too.For the two series processors, the eSDHCs are becoming more and more different. We should have split it into two drivers, like them (
sdhci-of-esdhc.c/sdhci-esdhc-imx.c) in linux kernel.It's ideal to keep common part for reusing. However, it's hard to find out a little which could be reused. The truth is there will be more and more different registers, bits and operatiing processes. Even some code is common now, it may have to be split in the future. So let's just split is as two drivers.
Quoted 12 lines
Patch #2 just created a
fsl_esdhc_imxdriver which was a copy offsl_esdhcdriver for i.MX processors.
Patch #3 converted i.MX platforms to usefsl_esdhc_imx. Patch #4 and #5 just dropped useless code for the two driver. There are still many cleaning up works needed to be done in the future,
because the eSDHC driver is mess for a long time.
Since I'm only owner for QorIQ eSDHC driver, I dropped only a little things which I'm sure forfsl_esdhc_imx. Let i.MX eSDHC owner do futhur
cleaning up.
For series:
Quoted 265 lines
---
Changes for v6:
- Rebased.
- Applied to two new i.MX boards phycore_pcl063_ull/pico-imx7d_bl33.Yangbo Lu (5):
MoveCONFIG_FSL_ESDHCto defconfig
mmc: splitfsl_esdhcdriver for i.MX
Convert to usefsl_esdhc_imxfor i.MX platforms
mmc:fsl_esdhc: drop i.MX code
mmc:fsl_esdhc_imx: drop useless codearch/arm/cpu/arm1136/mx35/generic.c | 10 +- arch/arm/cpu/arm926ejs/mx25/generic.c | 8 +- arch/arm/cpu/armv7/vf610/generic.c | 10 +- arch/arm/cpu/armv8/s32v234/generic.c | 2 +- arch/arm/include/asm/global_data.h | 2 +- arch/arm/mach-imx/cpu.c | 6 +- arch/arm/mach-imx/mx6/litesom.c | 4 +- arch/arm/mach-imx/mx7/clock.c | 4 +- arch/arm/mach-imx/mx7ulp/clock.c | 2 +- arch/arm/mach-imx/speed.c | 4 +- arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +- board/advantech/dms-ba16/dms-ba16.c | 4 +- board/aristainetos/aristainetos-v1.c | 2 +- board/aristainetos/aristainetos-v2.c | 2 +- board/aristainetos/aristainetos.c | 4 +- board/bachmann/ot1200/ot1200.c | 2 +- board/barco/platinum/platinum.c | 2 +- board/barco/titanium/titanium.c | 4 +- board/boundary/nitrogen6x/nitrogen6x.c | 4 +- board/ccv/xpress/xpress.c | 2 +- board/compulab/cl-som-imx7/cl-som-imx7.c | 6 +- board/compulab/cl-som-imx7/common.c | 6 +- board/compulab/cl-som-imx7/common.h | 8 +- board/compulab/cl-som-imx7/mux.c | 8 +- board/compulab/cl-som-imx7/spl.c | 6 +- board/compulab/cm_fx6/cm_fx6.c | 4 +- board/compulab/cm_fx6/common.c | 4 +- board/compulab/cm_fx6/spl.c | 2 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 4 +- board/dhelectronics/dh_imx6/dh_imx6.c | 2 +- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 2 +- board/el/el6x/el6x.c | 4 +- board/embest/mx6boards/mx6boards.c | 4 +- board/freescale/imx8mq_evk/imx8mq_evk.c | 2 +- board/freescale/imx8mq_evk/spl.c | 2 +- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 2 +- board/freescale/m54418twr/m54418twr.c | 2 +- board/freescale/mx25pdk/mx25pdk.c | 6 +- board/freescale/mx35pdk/mx35pdk.c | 4 +- board/freescale/mx51evk/mx51evk.c | 6 +- board/freescale/mx53ard/mx53ard.c | 4 +- board/freescale/mx53evk/mx53evk.c | 4 +- board/freescale/mx53loco/mx53loco.c | 4 +- board/freescale/mx53smd/mx53smd.c | 4 +- board/freescale/mx6qarm2/mx6qarm2.c | 4 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 4 +- board/freescale/mx6sabresd/mx6sabresd.c | 4 +- board/freescale/mx6slevk/mx6slevk.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 4 +- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +- board/freescale/s32v234evb/s32v234evb.c | 4 +- board/freescale/vf610twr/vf610twr.c | 4 +- board/gateworks/gw_ventana/common.c | 6 +- board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/ge/bx50v3/bx50v3.c | 2 +- board/ge/mx53ppd/mx53ppd.c | 2 +- board/grinn/liteboard/board.c | 4 +- board/inversepath/usbarmory/usbarmory.c | 2 +- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 4 +- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 2 +- board/kosagi/novena/novena.c | 2 +- board/kosagi/novena/novena_spl.c | 6 +- board/liebherr/display5/common.c | 2 +- board/liebherr/display5/display5.c | 6 +- board/liebherr/display5/spl.c | 2 +- board/liebherr/mccmon6/mccmon6.c | 2 +- board/liebherr/mccmon6/spl.c | 2 +- board/logicpd/imx6/imx6logic.c | 4 +- board/menlo/m53menlo/m53menlo.c | 4 +- board/phytec/pcl063/pcl063.c | 2 +- board/phytec/pcl063/spl.c | 6 +- board/phytec/pcm058/pcm058.c | 2 +- board/phytec/pfla02/pfla02.c | 2 +- board/seco/common/mx6.c | 2 +- board/seco/mx6quq7/mx6quq7.c | 2 +- board/sks-kinkel/sksimx6/sksimx6.c | 2 +- board/softing/vining_2000/vining_2000.c | 2 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- board/tbs/tbs2910/tbs2910.c | 6 +- board/technexion/pico-imx6ul/spl.c | 2 +- board/technexion/pico-imx7d/spl.c | 2 +- board/technologic/ts4800/ts4800.c | 6 +- board/toradex/apalis_imx6/apalis_imx6.c | 6 +- board/toradex/colibri_imx6/colibri_imx6.c | 6 +- board/toradex/colibri_imx7/colibri_imx7.c | 2 +- board/tqc/tqma6/tqma6.c | 2 +- board/tqc/tqma6/tqma6_mba6.c | 2 +- board/tqc/tqma6/tqma6_wru4.c | 2 +- board/udoo/neo/neo.c | 2 +- board/udoo/udoo.c | 2 +- board/udoo/udoo_spl.c | 2 +- board/variscite/dart_6ul/dart_6ul.c | 2 +- board/variscite/dart_6ul/spl.c | 2 +- board/wandboard/spl.c | 2 +- board/warp/warp.c | 2 +- board/woodburn/woodburn.c | 4 +- configs/apalis_imx6_defconfig | 2 +- configs/aristainetos2_defconfig | 2 +- configs/aristainetos2b_defconfig | 2 +- configs/aristainetos_defconfig | 2 +- configs/bk4r1_defconfig | 2 +- configs/cgtqmx6eval_defconfig | 2 +- configs/cl-som-imx7_defconfig | 2 +- configs/cm_fx6_defconfig | 2 +- configs/colibri-imx6ull_defconfig | 2 +- configs/colibri_imx6_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- configs/colibri_imx7_emmc_defconfig | 2 +- configs/colibri_vf_defconfig | 2 +- configs/dh_imx6_defconfig | 2 +- configs/display5_defconfig | 2 +- configs/display5_factory_defconfig | 2 +- configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/ge_bx50v3_defconfig | 2 +- configs/gwventana_emmc_defconfig | 2 +- configs/gwventana_gw5904_defconfig | 2 +- configs/gwventana_nand_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6dl_mamoj_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6q_logic_defconfig | 2 +- configs/imx6qdl_icore_mipi_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 2 +- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- configs/imx6ul_isiot_emmc_defconfig | 2 +- configs/imx6ul_isiot_nand_defconfig | 2 +- configs/imx8mq_evk_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/kp_imx53_defconfig | 2 +- configs/kp_imx6q_tpc_defconfig | 1 + configs/liteboard_defconfig | 2 +- configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_qspi_defconfig | 1 + configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_tfa_defconfig | 1 + configs/m53menlo_defconfig | 2 +- configs/marsboard_defconfig | 2 +- configs/mccmon6_nor_defconfig | 2 +- configs/mccmon6_sd_defconfig | 2 +- configs/mx25pdk_defconfig | 2 +- configs/mx35pdk_defconfig | 2 +- configs/mx51evk_defconfig | 2 +- configs/mx53ard_defconfig | 2 +- configs/mx53cx9020_defconfig | 2 +- configs/mx53evk_defconfig | 2 +- configs/mx53loco_defconfig | 2 +- configs/mx53ppd_defconfig | 2 +- configs/mx53smd_defconfig | 2 +- configs/mx6cuboxi_defconfig | 2 +- configs/mx6dlarm2_defconfig | 2 +- configs/mx6dlarm2_lpddr2_defconfig | 2 +- configs/mx6qarm2_defconfig | 2 +- configs/mx6qarm2_lpddr2_defconfig | 2 +- configs/mx6qsabrelite_defconfig | 2 +- configs/mx6sabreauto_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/mx6slevk_defconfig | 2 +- configs/mx6slevk_spinor_defconfig | 2 +- configs/mx6slevk_spl_defconfig | 2 +- configs/mx6sllevk_defconfig | 2 +- configs/mx6sllevk_plugin_defconfig | 2 +- configs/mx6sxsabreauto_defconfig | 2 +- configs/mx6sxsabresd_defconfig | 2 +- configs/mx6sxsabresd_spl_defconfig | 2 +- configs/mx6ul_14x14_evk_defconfig | 2 +- configs/mx6ul_9x9_evk_defconfig | 2 +- configs/mx6ull_14x14_evk_defconfig | 2 +- configs/mx6ull_14x14_evk_plugin_defconfig | 2 +- configs/mx7dsabresd_defconfig | 2 +- configs/mx7dsabresd_qspi_defconfig | 2 +- configs/mx7ulp_evk_defconfig | 2 +- configs/mx7ulp_evk_plugin_defconfig | 2 +- configs/nitrogen6dl2g_defconfig | 2 +- configs/nitrogen6dl_defconfig | 2 +- configs/nitrogen6q2g_defconfig | 2 +- configs/nitrogen6q_defconfig | 2 +- configs/nitrogen6s1g_defconfig | 2 +- configs/nitrogen6s_defconfig | 2 +- configs/novena_defconfig | 2 +- configs/opos6uldev_defconfig | 2 +- configs/ot1200_defconfig | 2 +- configs/ot1200_spl_defconfig | 2 +- configs/pcm052_defconfig | 2 +- configs/pcm058_defconfig | 2 +- configs/pfla02_defconfig | 2 +- configs/phycore_pcl063_defconfig | 2 +- configs/phycore_pcl063_ull_defconfig | 2 +- configs/pico-hobbit-imx6ul_defconfig | 2 +- configs/pico-hobbit-imx7d_defconfig | 2 +- configs/pico-imx6ul_defconfig | 2 +- configs/pico-imx7d_bl33_defconfig | 2 +- configs/pico-imx7d_defconfig | 2 +- configs/pico-pi-imx6ul_defconfig | 2 +- configs/pico-pi-imx7d_defconfig | 2 +- configs/platinum_picon_defconfig | 2 +- configs/platinum_titanium_defconfig | 2 +- configs/riotboard_defconfig | 2 +- configs/riotboard_spl_defconfig | 2 +- configs/s32v234evb_defconfig | 2 +- configs/secomx6quq7_defconfig | 2 +- configs/sksimx6_defconfig | 2 +- configs/tbs2910_defconfig | 2 +- configs/titanium_defconfig | 2 +- configs/tqma6dl_mba6_mmc_defconfig | 2 +- configs/tqma6dl_mba6_spi_defconfig | 2 +- configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- configs/tqma6s_wru4_mmc_defconfig | 2 +- configs/ts4800_defconfig | 2 +- configs/udoo_defconfig | 2 +- configs/udoo_neo_defconfig | 2 +- configs/usbarmory_defconfig | 2 +- configs/variscite_dart6ul_defconfig | 2 +- configs/vf610twr_defconfig | 2 +- configs/vf610twr_nand_defconfig | 2 +- configs/vining_2000_defconfig | 2 +- configs/wandboard_defconfig | 2 +- configs/warp7_bl33_defconfig | 2 +- configs/warp7_defconfig | 2 +- configs/warp_defconfig | 2 +- configs/woodburn_defconfig | 2 +- configs/woodburn_sd_defconfig | 2 +- configs/xpress_defconfig | 2 +- configs/xpress_spl_defconfig | 2 +- configs/zc5202_defconfig | 2 +- configs/zc5601_defconfig | 2 +- drivers/mmc/Kconfig | 10 +- drivers/mmc/Makefile | 1 + drivers/mmc/fsl_esdhc.c | 626 +----------- ---------- drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} | 72 +-- include/configs/imx8mq_evk.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/kp_imx6q_tpc.h | 1 - include/configs/ls1012afrwy.h | 1 - include/fsl_esdhc.h | 57 -- include/{fsl_esdhc.h => fsl_esdhc_imx.h} | 17 +- 247 files changed, 351 insertions(+), 1047 deletions(-) copy drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} (95%) copy include/{fsl_esdhc.h => fsl_esdhc_imx.h} (97%)