| Message ID | 20220721132748.1052244-4-marcel@ziswiler.com |
|---|---|
| State | Accepted |
| Commit | 50b229523bbc5511e1bace34df779f84950bf872 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | arm: dts: imx: sync device trees with upstream linux kernel ones | expand |
On 21.07.22 15:27, Marcel Ziswiler wrote: > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > As a preparatory step make sure to refer to absolute node paths where > labels were removed in Linux upstream. Are you sure that this was removed upstream? It was just submitted for inclusion [1], and may not have landed yet. Regards, Soeren [1] https://lore.kernel.org/linux-arm-kernel/20220620003736.GN254723@dragon/T/ > > This avoids the following error once synchronised: > > +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1 > not found > +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc > not found > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > > arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi > index 65ab052ac2c..d48719e7d59 100644 > --- a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi > +++ b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > > -&aips1 { > +&{/soc/bus@2000000} { /* AIPS1 */ > u-boot,dm-pre-reloc; > }; > > @@ -8,7 +8,7 @@ > u-boot,dm-pre-reloc; > }; > > -&soc { > +&{/soc} { > u-boot,dm-pre-reloc; > }; >
On Thu, 2022-07-21 at 19:20 +0200, Soeren Moch wrote: > On 21.07.22 15:27, Marcel Ziswiler wrote: > > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > > > As a preparatory step make sure to refer to absolute node paths where > > labels were removed in Linux upstream. > Are you sure that this was removed upstream? Well, removed or never been there and still not there up to and including latest v5.19-rc7. > It was just submitted for inclusion [1], and may not have landed yet. Oh, okay. No, haven't seen that one yet. So it might make sense to re-base everything on latest -next then which would no longer require such change. Let me re-work this in a v2. Thanks! > Regards, > Soeren Cheers Marcel > [1] > https://lore.kernel.org/linux-arm-kernel/20220620003736.GN254723@dragon/T/ > > > > This avoids the following error once synchronised: > > > > +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1 > > not found > > +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc > > not found > > > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > --- > > > > arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi > > index 65ab052ac2c..d48719e7d59 100644 > > --- a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi > > +++ b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi > > @@ -1,6 +1,6 @@ > > // SPDX-License-Identifier: GPL-2.0+ > > > > -&aips1 { > > +&{/soc/bus@2000000} { /* AIPS1 */ > > u-boot,dm-pre-reloc; > > }; > > > > @@ -8,7 +8,7 @@ > > u-boot,dm-pre-reloc; > > }; > > > > -&soc { > > +&{/soc} { > > u-boot,dm-pre-reloc; > > };
Hi Marcel, On Thu, Jul 21, 2022 at 3:56 PM Marcel Ziswiler <marcel.ziswiler@toradex.com> wrote: > Oh, okay. No, haven't seen that one yet. So it might make sense to re-base everything on latest -next then > which would no longer require such change. Let me re-work this in a v2. Thanks! Yes, please sync with linux-next. linux-next has also an imx8mm/mq/mn/mp job ring fix for a problem that Andrey reported recently. Thanks for working on this! Cheers
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > As a preparatory step make sure to refer to absolute node paths where > labels were removed in Linux upstream. > This avoids the following error once synchronised: > +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1 > not found > +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc > not found > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
On 25.07.22 18:42, sbabic@denx.de wrote: >> From: Marcel Ziswiler <marcel.ziswiler@toradex.com> >> As a preparatory step make sure to refer to absolute node paths where >> labels were removed in Linux upstream. >> This avoids the following error once synchronised: >> +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1 >> not found >> +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc >> not found >> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Applied to u-boot-imx, master, thanks ! What a nonsense! We already discussed that it absolutely makes no sense to remove dt parts in u-boot that are accepted for linux and just not applied yet. Just to prepare a synchronization. Really stupid! Soeren > > Best regards, > Stefano Babic >
Hi Fabio On Thu, 2022-07-21 at 16:18 -0300, Fabio Estevam wrote: > Hi Marcel, > > On Thu, Jul 21, 2022 at 3:56 PM Marcel Ziswiler > <marcel.ziswiler@toradex.com> wrote: > > > Oh, okay. No, haven't seen that one yet. So it might make sense to re-base everything on latest -next then > > which would no longer require such change. Let me re-work this in a v2. Thanks! > > Yes, please sync with linux-next. Sorry, I just returned from vacation and noticed (almost a little bit shocked) that this series has already been applied by Stefano and subsequently been pulled into master by Tom despite this ongoing discussion. I actually had a v2 almost ready before I left for vacation. Oh, well... Anyway, now with Linux 5.19 out and it usually only taking up to two weeks for the next rc1 I plan to re-sync again once that is out and correct what Soeren reported here. I might also include further imx targets which I added in my v2. Let's see... > linux-next has also an imx8mm/mq/mn/mp job ring fix for a problem that > Andrey reported recently. That will then also be included in my 6.0-rc1 re-sync (;-p). > Thanks for working on this! You are very welcome. And sorry again for the inconvenience this kinda pre-mature application/pull caused. > Cheers Cheers Marcel
diff --git a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi index 65ab052ac2c..d48719e7d59 100644 --- a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi +++ b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -&aips1 { +&{/soc/bus@2000000} { /* AIPS1 */ u-boot,dm-pre-reloc; }; @@ -8,7 +8,7 @@ u-boot,dm-pre-reloc; }; -&soc { +&{/soc} { u-boot,dm-pre-reloc; };