diff options
| author | Tom Rini <[email protected]> | 2020-10-06 13:59:01 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-10-06 13:59:01 -0400 |
| commit | 42378e3cd2432e0353cdcc1789039293e4b46252 (patch) | |
| tree | 0d7f41a9e50432c32aca3cd7e611cfea70f9efc4 /drivers/core | |
| parent | 5dcf7cc590b348f1e730ec38242df64c179f10a8 (diff) | |
| parent | 175e8322bcee64127a24acdac12c54f5ddb95f82 (diff) | |
Merge tag 'dm-pull-6oct20' of git://git.denx.de/u-boot-dm
bloblist enhancement for alignment
Update ofnode/dev_read phandle function
sandbox keyboard enhancements and fixes
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/of_access.c | 7 | ||||
| -rw-r--r-- | drivers/core/ofnode.c | 6 | ||||
| -rw-r--r-- | drivers/core/read.c | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c index bcf1644d050..0a12e9b26f8 100644 --- a/drivers/core/of_access.c +++ b/drivers/core/of_access.c @@ -756,10 +756,11 @@ int of_parse_phandle_with_args(const struct device_node *np, } int of_count_phandle_with_args(const struct device_node *np, - const char *list_name, const char *cells_name) + const char *list_name, const char *cells_name, + int cell_count) { - return __of_parse_phandle_with_args(np, list_name, cells_name, 0, - -1, NULL); + return __of_parse_phandle_with_args(np, list_name, cells_name, + cell_count, -1, NULL); } static void of_alias_add(struct alias_prop *ap, struct device_node *np, diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 79fcdf5ce21..7d1b89514c7 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -432,15 +432,15 @@ int ofnode_parse_phandle_with_args(ofnode node, const char *list_name, } int ofnode_count_phandle_with_args(ofnode node, const char *list_name, - const char *cells_name) + const char *cells_name, int cell_count) { if (ofnode_is_np(node)) return of_count_phandle_with_args(ofnode_to_np(node), - list_name, cells_name); + list_name, cells_name, cell_count); else return fdtdec_parse_phandle_with_args(gd->fdt_blob, ofnode_to_offset(node), list_name, cells_name, - 0, -1, NULL); + cell_count, -1, NULL); } ofnode ofnode_path(const char *path) diff --git a/drivers/core/read.c b/drivers/core/read.c index 86f3f881706..076125824ca 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -214,10 +214,11 @@ int dev_read_phandle_with_args(const struct udevice *dev, const char *list_name, } int dev_count_phandle_with_args(const struct udevice *dev, - const char *list_name, const char *cells_name) + const char *list_name, const char *cells_name, + int cell_count) { return ofnode_count_phandle_with_args(dev_ofnode(dev), list_name, - cells_name); + cells_name, cell_count); } int dev_read_addr_cells(const struct udevice *dev) |