diff options
| author | Tom Rini <[email protected]> | 2021-01-31 08:49:53 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-01-31 08:49:53 -0500 |
| commit | 242ef48ea76ae13ac6357cc50aae01eb7a46bfef (patch) | |
| tree | 18105866b6063eddcc7ddb0530c002fadc377b3b /include/dm | |
| parent | 76404f86a24aa28efc26a296bf6ab9d697c60b9f (diff) | |
| parent | f84eda89e5970ef513fe64ba8e8d977788c44dca (diff) | |
Merge tag 'dm-pull-30jan21' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
tpm fixes for coral
binman fixes support for symbols in sub-sections
support for additional cros_ec commands
various minor fixes / tweaks
Diffstat (limited to 'include/dm')
| -rw-r--r-- | include/dm/device.h | 2 | ||||
| -rw-r--r-- | include/dm/read.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/dm/device.h b/include/dm/device.h index f5b4cd6876e..e665558444b 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -111,7 +111,7 @@ enum { * probe method if the device has a device tree node. * * All three of plat, priv and uclass_priv can be allocated by the - * driver, or you can use the auto_alloc_size members of struct driver and + * driver, or you can use the auto members of struct driver and * struct uclass_driver to have driver model do this automatically. * * @driver: The driver used by this device diff --git a/include/dm/read.h b/include/dm/read.h index c875e11a132..03ba98232a6 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -30,8 +30,7 @@ static inline const struct device_node *dev_np(const struct udevice *dev) } #endif -#ifndef CONFIG_DM_DEV_READ_INLINE - +#if !defined(CONFIG_DM_DEV_READ_INLINE) || CONFIG_IS_ENABLED(OF_PLATDATA) /** * dev_read_u32() - read a 32-bit integer from a device's DT property * @@ -1007,7 +1006,7 @@ static inline u64 dev_translate_dma_address(const struct udevice *dev, static inline int dev_read_alias_highest_id(const char *stem) { - if (!CONFIG_IS_ENABLED(OF_LIBFDT)) + if (!CONFIG_IS_ENABLED(OF_LIBFDT) || !gd->fdt_blob) return -1; return fdtdec_get_alias_highest_id(gd->fdt_blob, stem); } |