V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of http://git.denx.de/u-boot-mmc

This commit is contained in:
Tom Rini 2016-11-17 11:46:56 -05:00
parent 9e40ea04e9 91f839d2d3
commit c2cbd164ea
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configs/Sinlinx_SinA33_defconfig
View File

@ -4,7 +4,12 @@ CONFIG_MACH_SUN8I_A33=y
CONFIG_DRAM_CLK=552 CONFIG_DRAM_CLK=552
CONFIG_DRAM_ZQ=15291 CONFIG_DRAM_ZQ=15291
CONFIG_MMC0_CD_PIN="PB4" CONFIG_MMC0_CD_PIN="PB4"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_USB0_ID_DET="PH8" CONFIG_USB0_ID_DET="PH8"
CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:66000,le:90,ri:160,up:3,lo:127,hs:70,vs:20,sync:3,vmode:0"
CONFIG_VIDEO_LCD_DCLK_PHASE=0
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-sinlinx-sina33" CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-sinlinx-sina33"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y CONFIG_SPL=y

15
drivers/mmc/mmc.c
View File

@ -494,6 +494,7 @@ int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
{ {
struct mmc_cmd cmd; struct mmc_cmd cmd;
int timeout = 1000; int timeout = 1000;
int retries = 3;
int ret; int ret;
cmd.cmdidx = MMC_CMD_SWITCH; cmd.cmdidx = MMC_CMD_SWITCH;
@ -502,11 +503,17 @@ int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
(index << 16) | (index << 16) |
(value << 8); (value << 8);
ret = mmc_send_cmd(mmc, &cmd, NULL); while (retries > 0) {
ret = mmc_send_cmd(mmc, &cmd, NULL);
/* Waiting for the ready status */ /* Waiting for the ready status */
if (!ret) if (!ret) {
ret = mmc_send_status(mmc, timeout); ret = mmc_send_status(mmc, timeout);
return ret;
}
retries--;
}
return ret; return ret;

2
drivers/mmc/sunxi_mmc.c
View File

@ -463,7 +463,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)
cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
cfg->host_caps = MMC_MODE_4BIT; cfg->host_caps = MMC_MODE_4BIT;
#ifdef CONFIG_MACH_SUN50I #if defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN8I)
if (sdc_no == 2) if (sdc_no == 2)
cfg->host_caps = MMC_MODE_8BIT; cfg->host_caps = MMC_MODE_8BIT;
#endif #endif