Commit 18b587b4 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

mmc: sdhci-cadence: set SDHCI_QUIRK2_PRESET_VALUE_BROKEN for UniPhier 



The SDHCI_PRESET_FOR_* registers are not set for the UniPhier platform
integration. (They are all read as zeros).

Set the SDHCI_QUIRK2_PRESET_VALUE_BROKEN quirk flag. Otherwise, the
High Speed DDR mode on the eMMC controller (MMC_TIMING_MMC_DDR52)
would not work.

I split the platform data to give no impact to other platforms,
although the UniPhier platform is currently only the upstream user
of this IP.

The SDHCI_QUIRK2_PRESET_VALUE_BROKEN flag is set if the compatible
string matches to "socionext,uniphier-sd4hc".

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200312104257.21017-1-yamada.masahiro@socionext.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 3397b251

drivers/mmc/host/sdhci-cadence.c

+16 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/mmc/host.h>

#include <linux/mmc/mmc.h>

#include <linux/of.h>

#include <linux/of_device.h>



#include "sdhci-pltfm.h"
@@ -235,6 +236,11 @@ static const struct sdhci_ops sdhci_cdns_ops = { 
	.set_uhs_signaling = sdhci_cdns_set_uhs_signaling,

};



static const struct sdhci_pltfm_data sdhci_cdns_uniphier_pltfm_data = {

	.ops = &sdhci_cdns_ops,

	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,

};



static const struct sdhci_pltfm_data sdhci_cdns_pltfm_data = {

	.ops = &sdhci_cdns_ops,

};
@@ -334,6 +340,7 @@ static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc, 
static int sdhci_cdns_probe(struct platform_device *pdev)

{

	struct sdhci_host *host;

	const struct sdhci_pltfm_data *data;

	struct sdhci_pltfm_host *pltfm_host;

	struct sdhci_cdns_priv *priv;

	struct clk *clk;
@@ -350,8 +357,12 @@ static int sdhci_cdns_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	data = of_device_get_match_data(dev);

	if (!data)

		data = &sdhci_cdns_pltfm_data;



	nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node);

	host = sdhci_pltfm_init(pdev, &sdhci_cdns_pltfm_data,

	host = sdhci_pltfm_init(pdev, data,

				struct_size(priv, phy_params, nr_phy_params));

	if (IS_ERR(host)) {

		ret = PTR_ERR(host);
@@ -431,7 +442,10 @@ static const struct dev_pm_ops sdhci_cdns_pm_ops = { 
};



static const struct of_device_id sdhci_cdns_match[] = {

	{ .compatible = "socionext,uniphier-sd4hc" },

	{

		.compatible = "socionext,uniphier-sd4hc",

		.data = &sdhci_cdns_uniphier_pltfm_data,

	},

	{ .compatible = "cdns,sd4hc" },

	{ /* sentinel */ }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE