Commit 06ebc601 authored by Shawn Lin's avatar Shawn Lin Committed by Ulf Hansson

mmc: sdhci: remove CONFIG_MMC_DEBUG from the driver

sdhci uses CONFIG_MMC_DEBUG for showing ADMA descriptor
when occurring ADMA error. And it's also used to  dump the
registers whenever calling sdhci_add_host.

On one hand, I don't see any burden to always print the state
ADMA descriptor as it's rare and will help folks better understand
what was happening when seeing ADMA error.

On the other, folks may be interested in checking some registers
at probe time. So we remove the sdhci_dumpregs from __sdhci_add_host
and print some really useful registers in sdhci_setup_host.
Suggested-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 7b6bd20b
...@@ -2502,7 +2502,6 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask) ...@@ -2502,7 +2502,6 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask)
sdhci_finish_command(host); sdhci_finish_command(host);
} }
#ifdef CONFIG_MMC_DEBUG
static void sdhci_adma_show_error(struct sdhci_host *host) static void sdhci_adma_show_error(struct sdhci_host *host)
{ {
void *desc = host->adma_table; void *desc = host->adma_table;
...@@ -2530,9 +2529,6 @@ static void sdhci_adma_show_error(struct sdhci_host *host) ...@@ -2530,9 +2529,6 @@ static void sdhci_adma_show_error(struct sdhci_host *host)
break; break;
} }
} }
#else
static void sdhci_adma_show_error(struct sdhci_host *host) { }
#endif
static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
{ {
...@@ -3230,6 +3226,13 @@ int sdhci_setup_host(struct sdhci_host *host) ...@@ -3230,6 +3226,13 @@ int sdhci_setup_host(struct sdhci_host *host)
if (ret == -EPROBE_DEFER) if (ret == -EPROBE_DEFER)
return ret; return ret;
DBG("Version: 0x%08x | Present: 0x%08x\n",
sdhci_readw(host, SDHCI_HOST_VERSION),
sdhci_readl(host, SDHCI_PRESENT_STATE));
DBG("Caps: 0x%08x | Caps_1: 0x%08x\n",
sdhci_readl(host, SDHCI_CAPABILITIES),
sdhci_readl(host, SDHCI_CAPABILITIES_1));
sdhci_read_caps(host); sdhci_read_caps(host);
override_timeout_clk = host->timeout_clk; override_timeout_clk = host->timeout_clk;
...@@ -3747,10 +3750,6 @@ int __sdhci_add_host(struct sdhci_host *host) ...@@ -3747,10 +3750,6 @@ int __sdhci_add_host(struct sdhci_host *host)
goto untasklet; goto untasklet;
} }
#ifdef CONFIG_MMC_DEBUG
sdhci_dumpregs(host);
#endif
ret = sdhci_led_register(host); ret = sdhci_led_register(host);
if (ret) { if (ret) {
pr_err("%s: Failed to register LED device: %d\n", pr_err("%s: Failed to register LED device: %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment