LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: core: gracefully handle alias seq without of 

Gracefully handle alias seq in the platform data rather than OF case.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
This commit is contained in:
Marcel Ziswiler 2019-05-20 02:44:57 +02:00 committed by Tom Rini
parent f992af81e9
commit 45224e8f26
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/core/read.c
View File

@ -275,15 +275,17 @@ int dev_read_alias_seq(const struct udevice *dev, int *devnump)
{ {
ofnode node = dev_ofnode(dev); ofnode node = dev_ofnode(dev);
const char *uc_name = dev->uclass->uc_drv->name; const char *uc_name = dev->uclass->uc_drv->name;
int ret; int ret = -ENOTSUPP;
if (ofnode_is_np(node)) { if (ofnode_is_np(node)) {
ret = of_alias_get_id(ofnode_to_np(node), uc_name); ret = of_alias_get_id(ofnode_to_np(node), uc_name);
if (ret >= 0) if (ret >= 0)
*devnump = ret; *devnump = ret;
} else { } else {
#if CONFIG_IS_ENABLED(OF_CONTROL)
ret = fdtdec_get_alias_seq(gd->fdt_blob, uc_name, ret = fdtdec_get_alias_seq(gd->fdt_blob, uc_name,
ofnode_to_offset(node), devnump); ofnode_to_offset(node), devnump);
#endif
} }
return ret; return ret;

4
include/dm/read.h
View File

@ -923,8 +923,12 @@ static inline const void *dev_read_prop_by_prop(struct ofprop *prop,
static inline int dev_read_alias_seq(const struct udevice *dev, int *devnump) static inline int dev_read_alias_seq(const struct udevice *dev, int *devnump)
{ {
#if CONFIG_IS_ENABLED(OF_CONTROL)
return fdtdec_get_alias_seq(gd->fdt_blob, dev->uclass->uc_drv->name, return fdtdec_get_alias_seq(gd->fdt_blob, dev->uclass->uc_drv->name,
dev_of_offset(dev), devnump); dev_of_offset(dev), devnump);
#else
return -ENOTSUPP;
#endif
} }
static inline int dev_read_u32_array(const struct udevice *dev, static inline int dev_read_u32_array(const struct udevice *dev,