diff options
| author | Peng Fan <peng.fan@nxp.com> | 2017-06-12 17:50:55 +0800 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-07-12 09:44:22 +0200 |
| commit | f34ccce50a1805a6fdb2d1604ec4e40d79302455 (patch) | |
| tree | 5ae7352495e110941cb517422c023ea92340deda | |
| parent | 4483b7eb8874cb78a1ebddfcd599bec00c87ab71 (diff) | |
| download | u-boot-f34ccce50a1805a6fdb2d1604ec4e40d79302455.tar.gz | |
mmc: fsl_esdhc: drop CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT
CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT is not the correct method
to set I/O to 1.8. To boards that does not support vqmmc-supply,
use vs18_enable in fsl_esdhc_cfg. If regulator is supported,
use fixed 1.8V regulator for vqmmc-supply.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
| -rw-r--r-- | board/warp/warp.c | 2 | ||||
| -rw-r--r-- | doc/README.fsl-esdhc | 2 | ||||
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 4 | ||||
| -rw-r--r-- | include/configs/warp.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
5 files changed, 1 insertions, 9 deletions
diff --git a/board/warp/warp.c b/board/warp/warp.c index 0bc0a6a92e..b1b528a470 100644 --- a/board/warp/warp.c +++ b/board/warp/warp.c @@ -62,7 +62,7 @@ static void setup_iomux_uart(void) } static struct fsl_esdhc_cfg usdhc_cfg[1] = { - {USDHC2_BASE_ADDR}, + {USDHC2_BASE_ADDR, 0, 0, 0, 1}, }; int board_mmc_getcd(struct mmc *mmc) diff --git a/doc/README.fsl-esdhc b/doc/README.fsl-esdhc index 7e71387576..29cc6619ea 100644 --- a/doc/README.fsl-esdhc +++ b/doc/README.fsl-esdhc @@ -20,5 +20,3 @@ Freescale esdhc-specific options - CONFIG_SYS_FSL_ESDHC_BE ESDHC IP is in big-endian mode. Accessing ESDHC registers can be determined by ESDHC IP's endian mode or processor's endian mode. - - - CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT forces to run at 1.8V. diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 50ed80a4d8..3abd2d30af 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -673,10 +673,6 @@ static int esdhc_init(struct mmc *mmc) /* Set timout to the maximum value */ esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, 14 << 16); -#ifdef CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT - esdhc_setbits32(®s->vendorspec, ESDHC_VENDORSPEC_VSELECT); -#endif - if (priv->vs18_enable) esdhc_setbits32(®s->vendorspec, ESDHC_VENDORSPEC_VSELECT); diff --git a/include/configs/warp.h b/include/configs/warp.h index afe3eaed46..e3f79b199a 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -23,7 +23,6 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e261d02455..baf87996a8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3208,7 +3208,6 @@ CONFIG_SYS_FSL_ERRATUM_A_004934 CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_FSL_ESDHC_BE CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE CONFIG_SYS_FSL_ESDHC_LE CONFIG_SYS_FSL_ESDHC_NUM |