mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH master] mci: dw_mmc: make reset control optional again
@ 2021-11-01 17:52 Ahmad Fatoum
  2021-11-02  8:06 ` Sascha Hauer
  0 siblings, 1 reply; 5+ messages in thread
From: Ahmad Fatoum @ 2021-11-01 17:52 UTC (permalink / raw)
  To: barebox; +Cc: Ian Abbott, Ahmad Fatoum

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>
---
 drivers/mci/dw_mmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mci/dw_mmc.c b/drivers/mci/dw_mmc.c
index b402090ab3cb..86c4f43e88f5 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);
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-11-10  8:18 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-01 17:52 [PATCH master] mci: dw_mmc: make reset control optional again Ahmad Fatoum
2021-11-02  8:06 ` Sascha Hauer
2021-11-02  9:04   ` Philipp Zabel
2021-11-08 10:28   ` Ahmad Fatoum
2021-11-10  8:16     ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox