diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-17 11:46:56 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-17 11:46:56 -0500 |
| commit | c2cbd164ea5b5f564fcf03447c7bf9ec4a9f5699 (patch) | |
| tree | 87b539f2c0942f070c78f5d56cd53c5c68bcc2d2 | |
| parent | 9e40ea04e9f1a70a184504c9e2beb051eb2d9335 (diff) | |
| parent | 91f839d2d30e489c2d6bf0deafb65b01d416b715 (diff) | |
| download | u-boot-c2cbd164ea5b5f564fcf03447c7bf9ec4a9f5699.tar.gz | |
Merge branch 'master' of http://git.denx.de/u-boot-mmc
| -rw-r--r-- | configs/Sinlinx_SinA33_defconfig | 5 | ||||
| -rw-r--r-- | drivers/mmc/mmc.c | 15 | ||||
| -rw-r--r-- | drivers/mmc/sunxi_mmc.c | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index 2a5f985dd30..26b119a9b92 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -4,7 +4,12 @@ CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=15291 CONFIG_MMC0_CD_PIN="PB4" +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 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_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 4380c7c195a..d6b7e4f510c 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -494,6 +494,7 @@ int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value) { struct mmc_cmd cmd; int timeout = 1000; + int retries = 3; int ret; cmd.cmdidx = MMC_CMD_SWITCH; @@ -502,11 +503,17 @@ int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value) (index << 16) | (value << 8); - ret = mmc_send_cmd(mmc, &cmd, NULL); + while (retries > 0) { + ret = mmc_send_cmd(mmc, &cmd, NULL); - /* Waiting for the ready status */ - if (!ret) - ret = mmc_send_status(mmc, timeout); + /* Waiting for the ready status */ + if (!ret) { + ret = mmc_send_status(mmc, timeout); + return ret; + } + + retries--; + } return ret; diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 6953accce12..b8716c93cb0 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -463,7 +463,7 @@ struct mmc *sunxi_mmc_init(int sdc_no) cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; cfg->host_caps = MMC_MODE_4BIT; -#ifdef CONFIG_MACH_SUN50I +#if defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN8I) if (sdc_no == 2) cfg->host_caps = MMC_MODE_8BIT; #endif |