On Thu, Jul 12, 2018 at 06:20:05PM -0600, Rob Herring wrote:
> Generated phandle property values are a single cell, so set the type
> marker to uint32. Otherwise, we default to uint8.
>
> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
Applied, thanks.
> ---
> livetree.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/livetree.c b/livetree.c
> index 6e4c367f54b3..4ff0679e0062 100644
> --- a/livetree.c
> +++ b/livetree.c
> @@ -594,6 +594,7 @@ struct node *get_node_by_ref(struct node *tree, const char *ref)
> cell_t get_node_phandle(struct node *root, struct node *node)
> {
> static cell_t phandle = 1; /* FIXME: ick, static local */
> + struct data d = empty_data;
>
> if ((node->phandle != 0) && (node->phandle != -1))
> return node->phandle;
> @@ -603,17 +604,16 @@ cell_t get_node_phandle(struct node *root, struct node *node)
>
> node->phandle = phandle;
>
> + d = data_add_marker(d, TYPE_UINT32, NULL);
> + d = data_append_cell(d, phandle);
> +
> if (!get_property(node, "linux,phandle")
> && (phandle_format & PHANDLE_LEGACY))
> - add_property(node,
> - build_property("linux,phandle",
> - data_append_cell(empty_data, phandle)));
> + add_property(node, build_property("linux,phandle", d));
>
> if (!get_property(node, "phandle")
> && (phandle_format & PHANDLE_EPAPR))
> - add_property(node,
> - build_property("phandle",
> - data_append_cell(empty_data, phandle)));
> + add_property(node, build_property("phandle", d));
>
> /* If the node *does* have a phandle property, we must
> * be dealing with a self-referencing phandle, which will be
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
