]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Revert "mmc: mmc-uclass: Use max-frequency from device tree with default handling"
authorTanmay Kathpalia <tanmay.kathpalia@altera.com>
Thu, 8 Jan 2026 11:40:02 +0000 (03:40 -0800)
committerPeng Fan <peng.fan@nxp.com>
Thu, 8 Jan 2026 14:23:48 +0000 (22:23 +0800)
This reverts commit aebb523a23818a8ee4199c9532b51e3d4020696f.

The change to use dev_read_u32_default() with a default value of 0
causes regression for host controller drivers that hardcode f_max
before calling mmc_of_parse().

When the "max-frequency" property is not specified in the device tree,
dev_read_u32_default() returns 0, which overwrites the previously
configured f_max value set by the driver. This effectively resets
the maximum frequency to 0, breaking MMC functionality for those
controllers.

Revert to the original dev_read_u32() behavior which only updates
cfg->f_max when the "max-frequency" property is explicitly present
in the device tree, preserving driver-configured values otherwise.

Signed-off-by: Tanmay Kathpalia <tanmay.kathpalia@altera.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
drivers/mmc/mmc-uclass.c

index bf0bea9385322232e20fa524309f79840a9aa242..2f4dc5bd8872305129fcc192ba26bee60e764cd3 100644 (file)
@@ -243,13 +243,8 @@ int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg)
                return -EINVAL;
        }
 
-       /*
-        * Maximum frequency is obtained from the optional "max-frequency" property.
-        * If not specified in device tree, defaults to 0 and sdhci_setup_cfg()
-        * will set the MMC configuration maximum frequency to the host controller's
-        * maximum base clock frequency from capabilities register.
-        */
-       cfg->f_max = dev_read_u32_default(dev, "max-frequency", 0);
+       /* f_max is obtained from the optional "max-frequency" property */
+       dev_read_u32(dev, "max-frequency", &cfg->f_max);
 
        if (dev_read_bool(dev, "cap-sd-highspeed"))
                cfg->host_caps |= MMC_CAP(SD_HS);