On 7/7/20 10:22 AM, Ahmad Fatoum wrote: > For a while now, Linux has had a sdhci-omap driver for TI's OMAP SoCs > making use of the SDHCI core library. This was in addition to the > older omap-hsmmc driver, which didn't. > > Linux commit 0b4edf11187 ("ARM: dts: Move am33xx and am43xx mmc nodes to > sdhci-omap driver") changes the device tree compatible of the mmc nodes > on the am33xx and am43xx SoCs away from the omap-hsmmc to the SDHCI > driver. Add the new compatibles, so we aren't broken by the change. > > Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> > --- > Hello Sascha, > > recent v5.8-rc3 sync breaks barebox SD/MMC use on OMAP3 and OMAP4 SoCs, Correction: I don't really understand the naming scheme, but seems only OMAP4 should be broken at the moment. (I tested on a beaglebone black) > like the beaglebone. Please rebase the sync on this patch, so we avoid > intermittent breakage.. > > Cheers, > Ahmad > --- > drivers/mci/omap_hsmmc.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c > index b14161032594..6623503cee06 100644 > --- a/drivers/mci/omap_hsmmc.c > +++ b/drivers/mci/omap_hsmmc.c > @@ -650,6 +650,12 @@ static __maybe_unused struct of_device_id omap_mmc_dt_ids[] = { > }, { > .compatible = "ti,omap4-hsmmc", > .data = &omap4_data, > + }, { > + .compatible = "ti,am335-sdhci", > + .data = &omap4_data, > + }, { > + .compatible = "ti,am437-sdhci", > + .data = &omap4_data, > }, { > /* sentinel */ > } > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox