61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
|
From dfc4661c2499aeb0a43b8a13b55213d1c190f640 Mon Sep 17 00:00:00 2001
|
||
|
|
From: yangbo lu <yangbo.lu@freescale.com>
|
||
|
|
Date: Tue, 19 Apr 2016 09:47:15 +0800
|
||
|
|
Subject: [PATCH 48/70] mmc: sdhci-of-esdhc: add/remove some quirks according
|
||
|
|
to vendor version
|
||
|
|
|
||
|
|
commit 6c42cb309fee2e126beed6b96a986dc7d85a033d
|
||
|
|
[context adjustment]
|
||
|
|
|
||
|
|
A previous patch had removed esdhc_of_platform_init() by mistake.
|
||
|
|
static void esdhc_of_platform_init(struct sdhci_host *host)
|
||
|
|
{
|
||
|
|
u32 vvn;
|
||
|
|
|
||
|
|
vvn = in_be32(host->ioaddr + SDHCI_SLOT_INT_STATUS);
|
||
|
|
vvn = (vvn & SDHCI_VENDOR_VER_MASK) >> SDHCI_VENDOR_VER_SHIFT;
|
||
|
|
if (vvn == VENDOR_V_22)
|
||
|
|
host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;
|
||
|
|
|
||
|
|
if (vvn > VENDOR_V_22)
|
||
|
|
host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ;
|
||
|
|
}
|
||
|
|
|
||
|
|
This patch is used to fix it by add/remove some quirks according to
|
||
|
|
verdor version in probe.
|
||
|
|
|
||
|
|
Signed-off-by: Yangbo Lu <yangbo.lu@freescale.com>
|
||
|
|
Fixes: f4932cfd22f1 ("mmc: sdhci-of-esdhc: support both BE and LE host controller")
|
||
|
|
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
|
||
|
|
Integrated-by: Zhao Qiang <qiang.zhao@nxp.com>
|
||
|
|
---
|
||
|
|
drivers/mmc/host/sdhci-of-esdhc.c | 10 ++++++++++
|
||
|
|
1 file changed, 10 insertions(+)
|
||
|
|
|
||
|
|
--- a/drivers/mmc/host/sdhci-of-esdhc.c
|
||
|
|
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
|
||
|
|
@@ -584,6 +584,8 @@ static int sdhci_esdhc_probe(struct plat
|
||
|
|
{
|
||
|
|
struct sdhci_host *host;
|
||
|
|
struct device_node *np;
|
||
|
|
+ struct sdhci_pltfm_host *pltfm_host;
|
||
|
|
+ struct sdhci_esdhc *esdhc;
|
||
|
|
int ret;
|
||
|
|
|
||
|
|
np = pdev->dev.of_node;
|
||
|
|
@@ -611,6 +613,14 @@ static int sdhci_esdhc_probe(struct plat
|
||
|
|
if (of_device_is_compatible(np, "fsl,ls1021a-esdhc"))
|
||
|
|
host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
|
||
|
|
|
||
|
|
+ pltfm_host = sdhci_priv(host);
|
||
|
|
+ esdhc = pltfm_host->priv;
|
||
|
|
+ if (esdhc->vendor_ver == VENDOR_V_22)
|
||
|
|
+ host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;
|
||
|
|
+
|
||
|
|
+ if (esdhc->vendor_ver > VENDOR_V_22)
|
||
|
|
+ host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ;
|
||
|
|
+
|
||
|
|
if (of_device_is_compatible(np, "fsl,p2020-esdhc")) {
|
||
|
|
/*
|
||
|
|
* Freescale messed up with P2020 as it has a non-standard
|