brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-21 12:10:24 +09:00
Code Issues Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-mmc

Browse Source
This commit is contained in:
Tom Rini 2018-05-01 22:38:18 -04:00
commit 8b4a610af9
6 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/samsung/common/exynos5-dt.c
View File

@ -93,6 +93,9 @@ int exynos_power_init(void)
struct udevice *dev; struct udevice *dev;
int ret; int ret;
#ifdef CONFIG_PMIC_S2MPS11
ret = pmic_get("s2mps11_pmic", &dev);
#else
ret = pmic_get("max77686", &dev); ret = pmic_get("max77686", &dev);
if (!ret) { if (!ret) {
/* TODO(sjg@chromium.org): Move into the clock/pmic API */ /* TODO(sjg@chromium.org): Move into the clock/pmic API */
@ -112,6 +115,7 @@ int exynos_power_init(void)
s5m8767_enable_32khz_cp(dev); s5m8767_enable_32khz_cp(dev);
#endif #endif
} }
#endif /* CONFIG_PMIC_S2MPS11 */
if (ret == -ENODEV) if (ret == -ENODEV)
return 0; return 0;

2
drivers/mmc/mmc.c
View File

@ -1689,7 +1689,7 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
#if CONFIG_IS_ENABLED(MMC_WRITE) #if CONFIG_IS_ENABLED(MMC_WRITE)
err = sd_read_ssr(mmc); err = sd_read_ssr(mmc);
if (!err) if (err)
pr_warn("unable to read ssr\n"); pr_warn("unable to read ssr\n");
#endif #endif
if (!err) if (!err)

8
drivers/mmc/sdhci.c
View File

@ -462,7 +462,8 @@ static int sdhci_set_ios(struct mmc *mmc)
else else
ctrl &= ~SDHCI_CTRL_HISPD; ctrl &= ~SDHCI_CTRL_HISPD;
if (host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) if ((host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||
(host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE))
ctrl &= ~SDHCI_CTRL_HISPD; ctrl &= ~SDHCI_CTRL_HISPD;
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
@ -602,6 +603,11 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
cfg->host_caps &= ~MMC_MODE_8BIT; cfg->host_caps &= ~MMC_MODE_8BIT;
} }
if (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE) {
cfg->host_caps &= ~MMC_MODE_HS;
cfg->host_caps &= ~MMC_MODE_HS_52MHz;
}
if (host->host_caps) if (host->host_caps)
cfg->host_caps |= host->host_caps; cfg->host_caps |= host->host_caps;

2
drivers/mmc/zynq_sdhci.c
View File

@ -54,7 +54,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
SDHCI_QUIRK_BROKEN_R1B; SDHCI_QUIRK_BROKEN_R1B;
#ifdef CONFIG_ZYNQ_HISPD_BROKEN #ifdef CONFIG_ZYNQ_HISPD_BROKEN
host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT; host->quirks |= SDHCI_QUIRK_BROKEN_HISPD_MODE;
#endif #endif
host->max_clk = clock; host->max_clk = clock;

2
drivers/power/mfd/fg_max77693.c
View File

@ -60,8 +60,6 @@ static int power_update_battery(struct pmic *p, struct pmic *bat)
return ret; return ret;
max77693_get_vcell(&pb->bat->voltage_uV); max77693_get_vcell(&pb->bat->voltage_uV);
if (ret)
return ret;
return 0; return 0;
} }

6
include/sdhci.h
View File

@ -213,6 +213,12 @@
#define SDHCI_QUIRK_BROKEN_R1B (1 << 2) #define SDHCI_QUIRK_BROKEN_R1B (1 << 2)
#define SDHCI_QUIRK_NO_HISPD_BIT (1 << 3) #define SDHCI_QUIRK_NO_HISPD_BIT (1 << 3)
#define SDHCI_QUIRK_BROKEN_VOLTAGE (1 << 4) #define SDHCI_QUIRK_BROKEN_VOLTAGE (1 << 4)
/*
* SDHCI_QUIRK_BROKEN_HISPD_MODE
* the hardware cannot operate correctly in high-speed mode,
* this quirk forces the sdhci host-controller to non high-speed mode
*/
#define SDHCI_QUIRK_BROKEN_HISPD_MODE BIT(5)
#define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6) #define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6)
#define SDHCI_QUIRK_USE_WIDE8 (1 << 8) #define SDHCI_QUIRK_USE_WIDE8 (1 << 8)