mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH master] of: override existing reg property in of_fixup_reserved_memory
Date: Fri, 9 Jun 2023 08:19:33 +0200	[thread overview]
Message-ID: <20230609061933.GM18491@pengutronix.de> (raw)
In-Reply-To: <20230608143818.3147443-1-a.fatoum@pengutronix.de>

On Thu, Jun 08, 2023 at 04:38:18PM +0200, Ahmad Fatoum wrote:
> of_new_property doesn't care for existing properties and would happily
> add a property that already exists leading Linux to trip over it when
> creating the VFS view into the device tree.
> 
> Fix this by using of_set_property, which would delete an existing
> reg property first, before adding it anew.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  common/oftree.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/common/oftree.c b/common/oftree.c
> index 620de6ed5649..3e85070d113c 100644
> --- a/common/oftree.c
> +++ b/common/oftree.c
> @@ -308,8 +308,8 @@ int of_fixup_reserved_memory(struct device_node *root, void *_res)
>  	of_write_number(reg, res->start, addr_n_cells);
>  	of_write_number(reg + addr_n_cells, resource_size(res), size_n_cells);
>  
> -	of_new_property(child, "reg", reg,
> -			(addr_n_cells + size_n_cells) * sizeof(*reg));
> +	of_set_property(child, "reg", reg,
> +			(addr_n_cells + size_n_cells) * sizeof(*reg), true);
>  
>  	return 0;
>  }
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



      reply	other threads:[~2023-06-09  6:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-08 14:38 Ahmad Fatoum
2023-06-09  6:19 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230609061933.GM18491@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox