mmc: sdhci: move error message to more relevant place

"Hardware doesn't specify base clock frequency" may not be only the
error case of sdhci_setup_cfg().  It is better to print this where
the corresponding error is triggered.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-08-25 16:07:35 +09:00 committed by Jaehoon Chung
parent 8d549b61dc
commit 6c67954c93

View file

@ -536,8 +536,11 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
SDHCI_CLOCK_BASE_SHIFT; SDHCI_CLOCK_BASE_SHIFT;
cfg->f_max *= 1000000; cfg->f_max *= 1000000;
} }
if (cfg->f_max == 0) if (cfg->f_max == 0) {
printf("%s: Hardware doesn't specify base clock frequency\n",
__func__);
return -EINVAL; return -EINVAL;
}
if (min_clk) if (min_clk)
cfg->f_min = min_clk; cfg->f_min = min_clk;
else { else {
@ -577,6 +580,8 @@ int sdhci_bind(struct udevice *dev, struct mmc *mmc, struct mmc_config *cfg)
#else #else
int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk) int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
{ {
int ret;
#ifdef CONFIG_MMC_SDMA #ifdef CONFIG_MMC_SDMA
unsigned int caps; unsigned int caps;
@ -588,11 +593,9 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
} }
#endif #endif
if (sdhci_setup_cfg(&host->cfg, host, max_clk, min_clk)) { ret = sdhci_setup_cfg(&host->cfg, host, max_clk, min_clk);
printf("%s: Hardware doesn't specify base clock frequency\n", if (ret)
__func__); return ret;
return -EINVAL;
}
if (host->quirks & SDHCI_QUIRK_BROKEN_VOLTAGE) if (host->quirks & SDHCI_QUIRK_BROKEN_VOLTAGE)
host->cfg.voltages |= host->voltages; host->cfg.voltages |= host->voltages;