mmc: sdhci-cadence: override spec version

The datasheet of the IP (sd4hc) says it is compiatible with SDHCI v4,
but the spec version field in the version register is read as 2
(i.e. SDHCI_SPEC_300) based on the RTL provided by Cadence.

Socionext did not fix it up when it integrated the IP into the SoCs.
So, it is working as SDHCI v3.

It is not a real problem because there is no difference in the program
flow in sdhci.c between SDHCI_SPEC_300/400, but set the real version
just in case.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
index 9797e5d4e4a8ea167dbfe470095e6dfa1272a09b..ae0ec27dd7cce046151e550ef445f78bf77e1242 100644 (file)
--- a/drivers/mmc/host/sdhci-cadence.c
+++ b/drivers/mmc/host/sdhci-cadence.c
@@ -340,6 +340,7 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
        unsigned int nr_phy_params;
        int ret;
        struct device *dev = &pdev->dev;
+       static const u16 version = SDHCI_SPEC_400 << SDHCI_SPEC_VER_SHIFT;
 
        clk = devm_clk_get(dev, NULL);
        if (IS_ERR(clk))
@@ -369,6 +370,7 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
        host->mmc_host_ops.hs400_enhanced_strobe =
                                sdhci_cdns_hs400_enhanced_strobe;
        sdhci_enable_v4_mode(host);
+       __sdhci_read_caps(host, &version, NULL, NULL);
 
        sdhci_get_of_property(pdev);