diff options
author | Tom Rini <trini@konsulko.com> | 2018-01-24 11:28:44 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-01-24 11:28:44 -0500 |
commit | fb4413295c765aa8c013650984dc2d908964c81d (patch) | |
tree | 310dec76e0dd7c9227bad54ed372657f8e59713d /drivers/mmc/mmc-uclass.c | |
parent | 16121280188d3daa57b18ad623d0845bbbb5a90a (diff) | |
parent | 2f516e4aa286eb0203e34ab9be68b08f7a3c44c1 (diff) |
Merge git://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/mmc/mmc-uclass.c')
-rw-r--r-- | drivers/mmc/mmc-uclass.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 26c6ab7ad1..a3536b15ae 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -140,13 +140,12 @@ int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg) cfg->host_caps |= MMC_MODE_1BIT; break; default: - debug("warning: %s invalid bus-width property. using 1-bit\n", - dev_read_name(dev)); - cfg->host_caps |= MMC_MODE_1BIT; - break; + dev_err(dev, "Invalid \"bus-width\" value %u!\n", val); + return -EINVAL; } - cfg->f_max = dev_read_u32_default(dev, "max-frequency", 52000000); + /* 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); |