Commit c7c60bf6 authored by Doug Brown's avatar Doug Brown Committed by Ulf Hansson
Browse files

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: default avatarDoug Brown <doug@schmorgal.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20230116194401.20372-5-doug@schmorgal.com


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

drivers/mmc/host/sdhci-pxav2.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

	}