Skip to content

Commit

Permalink
dm: core: Introduce dev_read_alias_highest_id()
Browse files Browse the repository at this point in the history
It is wrapper for calling of_alias_get_highest_id() when live tree is
enabled and fdtdec_get_alias_highest_id() if not.

Signed-off-by: Michal Simek <[email protected]>
Reviewed-by: Heiko Schocher <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
  • Loading branch information
Michal Simek committed Feb 12, 2019
1 parent 4e1b5d6 commit 6f225cd
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/core/read.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,3 +264,11 @@ u64 dev_translate_address(struct udevice *dev, const fdt32_t *in_addr)
{
return ofnode_translate_address(dev_ofnode(dev), in_addr);
}

int dev_read_alias_highest_id(const char *stem)
{
if (of_live_active())
return of_alias_get_highest_id(stem);

return fdtdec_get_alias_highest_id(gd->fdt_blob, stem);
}
16 changes: 16 additions & 0 deletions include/dm/read.h
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,17 @@ int dev_read_resource_byname(struct udevice *dev, const char *name,
* @return the translated address; OF_BAD_ADDR on error
*/
u64 dev_translate_address(struct udevice *dev, const fdt32_t *in_addr);

/**
* dev_read_alias_highest_id - Get highest alias id for the given stem
* @stem: Alias stem to be examined
*
* The function travels the lookup table to get the highest alias id for the
* given alias stem.
* @return alias ID, if found, else -1
*/
int dev_read_alias_highest_id(const char *stem);

#else /* CONFIG_DM_DEV_READ_INLINE is enabled */

static inline int dev_read_u32(struct udevice *dev,
Expand Down Expand Up @@ -740,6 +751,11 @@ static inline u64 dev_translate_address(struct udevice *dev, const fdt32_t *in_a
return ofnode_translate_address(dev_ofnode(dev), in_addr);
}

static inline int dev_read_alias_highest_id(const char *stem)
{
return fdtdec_get_alias_highest_id(gd->fdt_blob, stem);
}

#endif /* CONFIG_DM_DEV_READ_INLINE */

/**
Expand Down

0 comments on commit 6f225cd

Please sign in to comment.