Commit a0753ef6 authored by Liming Sun's avatar Liming Sun Committed by Ulf Hansson
Browse files

mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 SoC 



The commit 08f3dff7 (mmc: sdhci-of-dwcmshc: add rockchip platform
support") introduces the use of_device_get_match_data() to check for some
chips. Unfortunately, it also breaks the BlueField-3 FW, which uses ACPI.

To fix the problem, let's add the ACPI match data and the corresponding
quirks to re-enable the support for the BlueField-3 SoC.

Reviewed-by: default avatarDavid Woods <davwoods@nvidia.com>
Signed-off-by: default avatarLiming Sun <limings@nvidia.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Fixes: 08f3dff7 ("mmc: sdhci-of-dwcmshc: add rockchip platform support")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220809173742.178440-1-limings@nvidia.com


[Ulf: Clarified the commit message a bit]
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b3e1cf31

drivers/mmc/host/sdhci-of-dwcmshc.c

+14 −2
Original line number Diff line number Diff line
@@ -349,6 +349,15 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { 
	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,

};



#ifdef CONFIG_ACPI

static const struct sdhci_pltfm_data sdhci_dwcmshc_bf3_pdata = {

	.ops = &sdhci_dwcmshc_ops,

	.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,

	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |

		   SDHCI_QUIRK2_ACMD23_BROKEN,

};

#endif



static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {

	.ops = &sdhci_dwcmshc_rk35xx_ops,

	.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
@@ -431,7 +440,10 @@ MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids); 


#ifdef CONFIG_ACPI

static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = {

	{ .id = "MLNXBF30" },

	{

		.id = "MLNXBF30",

		.driver_data = (kernel_ulong_t)&sdhci_dwcmshc_bf3_pdata,

	},

	{}

};

#endif
@@ -447,7 +459,7 @@ static int dwcmshc_probe(struct platform_device *pdev) 
	int err;

	u32 extra;



	pltfm_data = of_device_get_match_data(&pdev->dev);

	pltfm_data = device_get_match_data(&pdev->dev);

	if (!pltfm_data) {

		dev_err(&pdev->dev, "Error: No device match data found\n");

		return -ENODEV;