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 /include/dm/ofnode.h | |
| 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 'include/dm/ofnode.h')
| -rw-r--r-- | include/dm/ofnode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 4f89db44c1..5c4cbf0998 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -254,7 +254,7 @@ int ofnode_read_u64(ofnode node, const char *propname, u64 *outp); * @def: default value to return if the property has no value * @return property value, or @def if not found */ -int ofnode_read_u64_default(ofnode node, const char *propname, u64 def); +u64 ofnode_read_u64_default(ofnode node, const char *propname, u64 def); /** * ofnode_read_string() - Read a string from a property |