Commit 060522d8 authored by Chris Packham's avatar Chris Packham Committed by Ulf Hansson

mmc: sdhci-of-esdhc: Don't walk device-tree on every interrupt

Commit b214fe59 ("mmc: sdhci-of-esdhc: add erratum eSDHC7 support")
added code to check for a specific compatible string in the device-tree
on every esdhc interrupat. Instead of doing this record the quirk in
struct sdhci_esdhc and lookup the struct in esdhc_irq.
Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20200903012029.25673-1-chris.packham@alliedtelesis.co.nz
Fixes: b214fe59 ("mmc: sdhci-of-esdhc: add erratum eSDHC7 support")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent a395acf0
...@@ -81,6 +81,7 @@ struct sdhci_esdhc { ...@@ -81,6 +81,7 @@ struct sdhci_esdhc {
bool quirk_tuning_erratum_type2; bool quirk_tuning_erratum_type2;
bool quirk_ignore_data_inhibit; bool quirk_ignore_data_inhibit;
bool quirk_delay_before_data_reset; bool quirk_delay_before_data_reset;
bool quirk_trans_complete_erratum;
bool in_sw_tuning; bool in_sw_tuning;
unsigned int peripheral_clock; unsigned int peripheral_clock;
const struct esdhc_clk_fixup *clk_fixup; const struct esdhc_clk_fixup *clk_fixup;
...@@ -1177,10 +1178,11 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host, ...@@ -1177,10 +1178,11 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host,
static u32 esdhc_irq(struct sdhci_host *host, u32 intmask) static u32 esdhc_irq(struct sdhci_host *host, u32 intmask)
{ {
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
u32 command; u32 command;
if (of_find_compatible_node(NULL, NULL, if (esdhc->quirk_trans_complete_erratum) {
"fsl,p2020-esdhc")) {
command = SDHCI_GET_CMD(sdhci_readw(host, command = SDHCI_GET_CMD(sdhci_readw(host,
SDHCI_COMMAND)); SDHCI_COMMAND));
if (command == MMC_WRITE_MULTIPLE_BLOCK && if (command == MMC_WRITE_MULTIPLE_BLOCK &&
...@@ -1334,8 +1336,10 @@ static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host) ...@@ -1334,8 +1336,10 @@ static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host)
esdhc->clk_fixup = match->data; esdhc->clk_fixup = match->data;
np = pdev->dev.of_node; np = pdev->dev.of_node;
if (of_device_is_compatible(np, "fsl,p2020-esdhc")) if (of_device_is_compatible(np, "fsl,p2020-esdhc")) {
esdhc->quirk_delay_before_data_reset = true; esdhc->quirk_delay_before_data_reset = true;
esdhc->quirk_trans_complete_erratum = true;
}
clk = of_clk_get(np, 0); clk = of_clk_get(np, 0);
if (!IS_ERR(clk)) { if (!IS_ERR(clk)) {
......
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