Commit e095b78e authored by Brad Larson's avatar Brad Larson Committed by Ulf Hansson
Browse files

mmc: sdhci-cadence: Support device specific init during probe 



Move struct sdhci_pltfm_data under new struct sdhci_cdns_drv_data.
Add an init() into sdhci_cdns_drv_data for platform specific device
initialization in the device probe which is not used for existing devices.

Signed-off-by: default avatarBrad Larson <blarson@amd.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20230410184526.15990-13-blarson@amd.com


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

drivers/mmc/host/sdhci-cadence.c

+23 −9
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ struct sdhci_cdns_phy_cfg { 
	u8 addr;

};



struct sdhci_cdns_drv_data {

	int (*init)(struct platform_device *pdev);

	const struct sdhci_pltfm_data pltfm_data;

};



static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = {

	{ "cdns,phy-input-delay-sd-highspeed", SDHCI_CDNS_PHY_DLY_SD_HS, },

	{ "cdns,phy-input-delay-legacy", SDHCI_CDNS_PHY_DLY_SD_DEFAULT, },
@@ -325,13 +330,17 @@ 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 = {

static const struct sdhci_cdns_drv_data sdhci_cdns_uniphier_drv_data = {

	.pltfm_data = {

		.ops = &sdhci_cdns_ops,

		.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,

	},

};



static const struct sdhci_pltfm_data sdhci_cdns_pltfm_data = {

static const struct sdhci_cdns_drv_data sdhci_cdns_drv_data = {

	.pltfm_data = {

		.ops = &sdhci_cdns_ops,

	},

};



static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc,
@@ -357,7 +366,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;

	const struct sdhci_cdns_drv_data *data;

	struct sdhci_pltfm_host *pltfm_host;

	struct sdhci_cdns_priv *priv;

	struct clk *clk;
@@ -376,10 +385,10 @@ static int sdhci_cdns_probe(struct platform_device *pdev) 


	data = of_device_get_match_data(dev);

	if (!data)

		data = &sdhci_cdns_pltfm_data;

		data = &sdhci_cdns_drv_data;



	nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node);

	host = sdhci_pltfm_init(pdev, data,

	host = sdhci_pltfm_init(pdev, &data->pltfm_data,

				struct_size(priv, phy_params, nr_phy_params));

	if (IS_ERR(host)) {

		ret = PTR_ERR(host);
@@ -397,6 +406,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev) 
	host->ioaddr += SDHCI_CDNS_SRS_BASE;

	host->mmc_host_ops.hs400_enhanced_strobe =

				sdhci_cdns_hs400_enhanced_strobe;

	if (data->init) {

		ret = data->init(pdev);

		if (ret)

			goto free;

	}

	sdhci_enable_v4_mode(host);

	__sdhci_read_caps(host, &version, NULL, NULL);
@@ -461,7 +475,7 @@ static const struct dev_pm_ops sdhci_cdns_pm_ops = { 
static const struct of_device_id sdhci_cdns_match[] = {

	{

		.compatible = "socionext,uniphier-sd4hc",

		.data = &sdhci_cdns_uniphier_pltfm_data,

		.data = &sdhci_cdns_uniphier_drv_data,

	},

	{ .compatible = "cdns,sd4hc" },

	{ /* sentinel */ }