[PATCH] fixup! of: overlay: do not parse phandles as properties

[PATCH] fixup! of: overlay: do not parse phandles as properties

[Rouven Czerwinski]

This breaks the eventual fixup of phandles into the linux device tree.
Fix this by also keeping the phandle properties in the DT.
---
 drivers/of/overlay.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 0bebe26e39..d7695726fc 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -60,7 +60,6 @@ static int of_overlay_apply(struct device_node *target,
 
 		if (of_prop_cmp(prop->name, "phandle") == 0) {
 			target->phandle = be32_to_cpup(prop->value);
-			continue;
 		}
 
 		err = of_set_property(target, prop->name, prop->value,
-- 
2.29.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! of: overlay: do not parse phandles as properties

[Marco Felsch]

On 21-01-13 18:00, Rouven Czerwinski wrote:
> This breaks the eventual fixup of phandles into the linux device tree.
> Fix this by also keeping the phandle properties in the DT.
> ---
>  drivers/of/overlay.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
> index 0bebe26e39..d7695726fc 100644
> --- a/drivers/of/overlay.c
> +++ b/drivers/of/overlay.c
> @@ -60,7 +60,6 @@ static int of_overlay_apply(struct device_node *target,
>  
>  		if (of_prop_cmp(prop->name, "phandle") == 0) {
>  			target->phandle = be32_to_cpup(prop->value);
> -			continue;
>  		}

Nit:

We could also remove the {} so it's becoming a two-liner :)

Regards,
  Marco

>  
>  		err = of_set_property(target, prop->name, prop->value,
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! of: overlay: do not parse phandles as properties

[Sascha Hauer]

On Wed, Jan 13, 2021 at 06:12:58PM +0100, Marco Felsch wrote:
> On 21-01-13 18:00, Rouven Czerwinski wrote:
> > This breaks the eventual fixup of phandles into the linux device tree.
> > Fix this by also keeping the phandle properties in the DT.
> > ---
> >  drivers/of/overlay.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
> > index 0bebe26e39..d7695726fc 100644
> > --- a/drivers/of/overlay.c
> > +++ b/drivers/of/overlay.c
> > @@ -60,7 +60,6 @@ static int of_overlay_apply(struct device_node *target,
> >  
> >  		if (of_prop_cmp(prop->name, "phandle") == 0) {
> >  			target->phandle = be32_to_cpup(prop->value);
> > -			continue;
> >  		}
> 
> Nit:
> 
> We could also remove the {} so it's becoming a two-liner :)

Did that while applying

Sascha

-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox