diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-08 21:14:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-08 21:15:13 -0400 |
| commit | 40e362a9ab5f1d409822942ee89d4473c2e01ee6 (patch) | |
| tree | ad63f4fdcc210a0a758e41528fb2f15ecedf6a31 /drivers/core | |
| parent | 2f760735c170c854ffca76be5607cec5c56fdc4f (diff) | |
| parent | cd45d6f3955c919b7f10793014db3dbcfd7df3bb (diff) | |
Merge tag 'mmc-9-6-2019' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
Bug fixes to mmc_spi
Add Aspeed SD driver
Fix dw_mmc timeout calculation
Fix timeout values passed to mmc_wait_dat0
sdhci dt caps/mask update
[trini: Fix evb-ast2500_defconfig CONFIG_MMC line]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/ofnode.c | 2 | ||||
| -rw-r--r-- | drivers/core/read.c | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index e74a662d1d..7eca00cd66 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -79,7 +79,7 @@ int ofnode_read_u64(ofnode node, const char *propname, u64 *outp) return 0; } -int ofnode_read_u64_default(ofnode node, const char *propname, u64 def) +u64 ofnode_read_u64_default(ofnode node, const char *propname, u64 def) { assert(ofnode_valid(node)); ofnode_read_u64(node, propname, &def); diff --git a/drivers/core/read.c b/drivers/core/read.c index 8b5502de11..fb3dcd9a79 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -44,6 +44,16 @@ int dev_read_u32u(struct udevice *dev, const char *propname, uint *outp) return 0; } +int dev_read_u64(struct udevice *dev, const char *propname, u64 *outp) +{ + return ofnode_read_u64(dev_ofnode(dev), propname, outp); +} + +u64 dev_read_u64_default(struct udevice *dev, const char *propname, u64 def) +{ + return ofnode_read_u64_default(dev_ofnode(dev), propname, def); +} + const char *dev_read_string(struct udevice *dev, const char *propname) { return ofnode_read_string(dev_ofnode(dev), propname); |