mmc: sdhci-pxav2: change clock name to match DT bindings

The devicetree bindings for this driver specify that the two allowed
clock names are io and core. Change this driver to look for io, but
allow any name if it fails for backwards compatibility. Follow the same
pattern used in sdhci-pxav3, but add support for EPROBE_DEFER.

Get rid of an unnecessary pdev->dev while we're at it.

Signed-off-by: Doug Brown <doug@schmorgal.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20230116194401.20372-5-doug@schmorgal.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index 5e01dab9442623e1e6bd79d8ab6a3f54e126d100..f5c86e1ba7341646cb4bcfd441907a3e913dacc2 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -199,16 +199,18 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
 
        pltfm_host = sdhci_priv(host);
 
-       clk = devm_clk_get(dev, "PXA-SDHCLK");
+       clk = devm_clk_get(dev, "io");
+       if (IS_ERR(clk) && PTR_ERR(clk) != -EPROBE_DEFER)
+               clk = devm_clk_get(dev, NULL);
        if (IS_ERR(clk)) {
-               dev_err(dev, "failed to get io clock\n");
                ret = PTR_ERR(clk);
+               dev_err_probe(dev, ret, "failed to get io clock\n");
                goto free;
        }
        pltfm_host->clk = clk;
        ret = clk_prepare_enable(clk);
        if (ret) {
-               dev_err(&pdev->dev, "failed to enable io clock\n");
+               dev_err(dev, "failed to enable io clock\n");
                goto free;
        }