diff options
| author |   Piotr Sroka <piotrs@cadence.com> | 2017-03-21 14:32:16 +0000 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2017-04-24 21:41:54 +0200 |
| commit | a0f8243229ed071c8da0ea7cedc1b7bf1b1515da (patch) | |
| tree | c0343ab3d0ebdc2b41a87326179a6a7d5f7756ec /drivers/mmc/host/sdhci-cadence.c | |
| parent | mmc: bcm2835: Fix possible NULL ptr dereference in bcm2835_request (diff) | |
| download | linux-dev-a0f8243229ed071c8da0ea7cedc1b7bf1b1515da.tar.xz linux-dev-a0f8243229ed071c8da0ea7cedc1b7bf1b1515da.zip | |
mmc: sdhci-cadence: Fix writing PHY delay
Add polling for ACK to be sure that data are written to PHY register.
Signed-off-by: Piotr Sroka <piotrs@cadence.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-cadence.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-cadence.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index 07a27dcb42be..84bdcc59c024 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c @@ -68,11 +68,12 @@ struct sdhci_cdns_priv { bool enhanced_strobe; }; -static void sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv, - u8 addr, u8 data) +static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv, + u8 addr, u8 data) { void __iomem *reg = priv->hrs_addr + SDHCI_CDNS_HRS04; u32 tmp; + int ret; tmp = (data << SDHCI_CDNS_HRS04_WDATA_SHIFT) | (addr << SDHCI_CDNS_HRS04_ADDR_SHIFT); @@ -81,8 +82,14 @@ static void sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv, tmp |= SDHCI_CDNS_HRS04_WR; writel(tmp, reg); + ret = readl_poll_timeout(reg, tmp, tmp & SDHCI_CDNS_HRS04_ACK, 0, 10); + if (ret) + return ret; + tmp &= ~SDHCI_CDNS_HRS04_WR; writel(tmp, reg); + + return 0; } static void sdhci_cdns_phy_init(struct sdhci_cdns_priv *priv) |