On Fri, 11 Feb 2022 at 08:51, Aswath Govindraju <a-govindraju@xxxxxx> wrote:
>
> The MMCSD IPs used in AM64 are the same as the ones used in J721E.
> Therefore, fix this by using the driver data from J721E for AM64 too, for
> both 8 and 4 bit instances.
>
> Fixes: 754b7f2f7d2a ("mmc: sdhci_am654: Add Support for TI's AM64 SoC")
> Signed-off-by: Aswath Govindraju <a-govindraju@xxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci_am654.c | 24 ++----------------------
> 1 file changed, 2 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
> index f654afbe8e83..b4891bb26648 100644
> --- a/drivers/mmc/host/sdhci_am654.c
> +++ b/drivers/mmc/host/sdhci_am654.c
> @@ -514,26 +514,6 @@ static const struct sdhci_am654_driver_data sdhci_j721e_4bit_drvdata = {
> .flags = IOMUX_PRESENT,
> };
>
> -static const struct sdhci_pltfm_data sdhci_am64_8bit_pdata = {
> - .ops = &sdhci_j721e_8bit_ops,
> - .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
> -};
> -
> -static const struct sdhci_am654_driver_data sdhci_am64_8bit_drvdata = {
> - .pdata = &sdhci_am64_8bit_pdata,
> - .flags = DLL_PRESENT | DLL_CALIB,
> -};
> -
> -static const struct sdhci_pltfm_data sdhci_am64_4bit_pdata = {
> - .ops = &sdhci_j721e_4bit_ops,
> - .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
> -};
> -
> -static const struct sdhci_am654_driver_data sdhci_am64_4bit_drvdata = {
> - .pdata = &sdhci_am64_4bit_pdata,
> - .flags = IOMUX_PRESENT,
> -};
> -
> static const struct soc_device_attribute sdhci_am654_devices[] = {
> { .family = "AM65X",
> .revision = "SR1.0",
> @@ -759,11 +739,11 @@ static const struct of_device_id sdhci_am654_of_match[] = {
> },
> {
> .compatible = "ti,am64-sdhci-8bit",
> - .data = &sdhci_am64_8bit_drvdata,
> + .data = &sdhci_j721e_8bit_drvdata,
> },
> {
> .compatible = "ti,am64-sdhci-4bit",
> - .data = &sdhci_am64_4bit_drvdata,
> + .data = &sdhci_j721e_4bit_drvdata,
> },
> { /* sentinel */ }
> };
> --
> 2.17.1
>
