summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2021-11-01 18:52:07 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2021-11-08 11:36:29 +0100
commit724512bbac14b869f165cdbef46bfdca5303a51a (patch)
treefce3cd34309d5e19f6d6a96c4af711cea8222a89
parent15ad9fc5aa1df634fa7da2dc06980d32f1bbef6e (diff)
downloadbarebox-724512bbac14b869f165cdbef46bfdca5303a51a.tar.gz
barebox-724512bbac14b869f165cdbef46bfdca5303a51a.tar.xz
mci: dw_mmc: make reset control optional again
As documented in 90bdf1e5d1e4 ("mci: dw_mmc: match against StarFive MMC compatibles"), it was intended for the reset to remain optional as to not break existing users. Unfortunately, my later a3cf324593ea ("mci: dw_mmc: add optional reset line") didn't heed that and made it required, breaking SoCFPGA DW-MMC use as a result. Revert that line to fix the regression. Fixes: a3cf324593ea ("mci: dw_mmc: add optional reset line") Reported-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20211101175207.2160779-1-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/mci/dw_mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mci/dw_mmc.c b/drivers/mci/dw_mmc.c
index b402090ab3..86c4f43e88 100644
--- a/drivers/mci/dw_mmc.c
+++ b/drivers/mci/dw_mmc.c
@@ -572,7 +572,7 @@ static int dw_mmc_probe(struct device_d *dev)
rst = reset_control_get(dev, "reset");
if (IS_ERR(rst)) {
- return PTR_ERR(rst);
+ dev_warn(dev, "error claiming reset: %pe\n", rst);
} else if (rst) {
reset_control_assert(rst);
udelay(10);