[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot, dm-pre-reloc to spi0

[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot, dm-pre-reloc to spi0

[Ezra Buehler]

Without this U-Boot-specific property, the Synology DS414/DS214+ fails
in SPL. As the spi0 node was not scanned the SPI flash cannot be found.

Signed-off-by: Ezra Buehler <ezra@easyb.ch>
---
 arch/arm/dts/armada-370-xp.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/dts/armada-370-xp.dtsi b/arch/arm/dts/armada-370-xp.dtsi
index 50fc0be9f7..21c38cf3f3 100644
--- a/arch/arm/dts/armada-370-xp.dtsi
+++ b/arch/arm/dts/armada-370-xp.dtsi
@@ -284,6 +284,7 @@
 			interrupts = <30>;
 			clocks = <&coreclk 0>;
 			status = "disabled";
+			u-boot,dm-pre-reloc;
 		};
 
 		spi1: spi at 10680 {
-- 
2.26.2

[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot,dm-pre-reloc to spi0

[Chris Packham]

On Mon, 4 May 2020, 8:00 AM Ezra Buehler, <ezra@easyb.ch> wrote:

> Without this U-Boot-specific property, the Synology DS414/DS214+ fails
> in SPL. As the spi0 node was not scanned the SPI flash cannot be found.
>
> Signed-off-by: Ezra Buehler <ezra@easyb.ch>
> ---
>  arch/arm/dts/armada-370-xp.dtsi | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/dts/armada-370-xp.dtsi
> b/arch/arm/dts/armada-370-xp.dtsi
> index 50fc0be9f7..21c38cf3f3 100644
> --- a/arch/arm/dts/armada-370-xp.dtsi
> +++ b/arch/arm/dts/armada-370-xp.dtsi
> @@ -284,6 +284,7 @@
>                         interrupts = <30>;
>                         clocks = <&coreclk 0>;
>                         status = "disabled";
> +                       u-boot,dm-pre-reloc;
>                 };
>
>                 spi1: spi at 10680 {
> --
>

I think this would be better in the specific board dts files. Not every
platform will want this in spl.

>

[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot,dm-pre-reloc to spi0

[Ezra Buehler]

Hi Chris,

> On 4 May 2020, at 10:04, Chris Packham <judge.packham@gmail.com> wrote:
> 
> I think this would be better in the specific board dts files. Not every platform will want this in spl.

Thanks for the input, I can do that. However, please note that before,
the "spi0" node was under "internal-regs" which had the
"u-boot,dm-pre-reloc" property. Commit c265bbe4d (rm: sync armada-xp dts
files from Linux 5.0) moved the node out and removed the U-Boot-specific
property. The property was then added again to "internal-regs" with
commit "1718a9f3b7 (arm: mvebu: armada-370-xp.dtsi: Add "u-boot,
dm-pre-reloc" to "internal-regs") but not to the spi0 node. So basically
this patch restores the previous behavior. What is better?

Cheers,
Ezra.

[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot,dm-pre-reloc to spi0

[Stefan Roese]

Hi Ezra,

On 04.05.20 20:12, Ezra Buehler wrote:
> Hi Chris,
> 
>> On 4 May 2020, at 10:04, Chris Packham <judge.packham@gmail.com> wrote:
>>
>> I think this would be better in the specific board dts files. Not every platform will want this in spl.
> 
> Thanks for the input, I can do that. However, please note that before,
> the "spi0" node was under "internal-regs" which had the
> "u-boot,dm-pre-reloc" property. Commit c265bbe4d (rm: sync armada-xp dts
> files from Linux 5.0) moved the node out and removed the U-Boot-specific
> property. The property was then added again to "internal-regs" with
> commit "1718a9f3b7 (arm: mvebu: armada-370-xp.dtsi: Add "u-boot,
> dm-pre-reloc" to "internal-regs") but not to the spi0 node. So basically
> this patch restores the previous behavior. What is better?

U-Boot specific DT properties, like "u-boot,dm-pre-reloc" should be
added in U-Boot specific DT dtsi files, e.g.

armada-xp-synology-ds414-u-boot.dtsi

in this case. Such files are included seamlessly by the build system.
Take a look at this file as an example:

arch/arm/dts/armada-3720-uDPU-u-boot.dtsi

This makes it possible to sync the DT files with Linux and still
integrate U-Boot specifics.

Thanks,
Stefan

[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot,dm-pre-reloc to spi0

[Ezra Buehler]

Hi Stefan,


On 5 May 2020, at 08:45, Stefan Roese <sr@denx.de> wrote:
> U-Boot specific DT properties, like "u-boot,dm-pre-reloc" should be
> added in U-Boot specific DT dtsi files

OK, that makes sense. However, in your commit 1718a9f3b7 (arm: mvebu:
armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs") you
wrote:

  I'm not adding this property in an *u-boot.dtsi file, since there is
  none matching the generic rules for all files including this dtsi
  file. So to not miss any of the boards using this dtsi file, I'm
  adding it to this file directly, which makes the Linux merge a less
  easy unforunately.


So, do you want me to try this now?

Cheers,
Ezra.

[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot,dm-pre-reloc to spi0

[Stefan Roese]

Hi Ezra,

On 05.05.20 09:10, Ezra Buehler wrote:
> On 5 May 2020, at 08:45, Stefan Roese <sr@denx.de> wrote:
>> U-Boot specific DT properties, like "u-boot,dm-pre-reloc" should be
>> added in U-Boot specific DT dtsi files
> 
> OK, that makes sense. However, in your commit 1718a9f3b7 (arm: mvebu:
> armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs") you
> wrote:
> 
>    I'm not adding this property in an *u-boot.dtsi file, since there is
>    none matching the generic rules for all files including this dtsi
>    file. So to not miss any of the boards using this dtsi file, I'm
>    adding it to this file directly, which makes the Linux merge a less
>    easy unforunately.
> 
> 
> So, do you want me to try this now?

Hmmm, I can't remember the exact details. Thanks for the reference.
But perhaps there is a matching *-u-boot.dtsi rule / pattern that can
be used to include such a newly introduced file. I would very much
welcome it, when you would investigate here.

Thanks,
Stefan

[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot,dm-pre-reloc to spi0

[Ezra Buehler]

Hi Stefan,

On 5 May 2020, at 10:58, Stefan Roese <sr@denx.de> wrote:
> 
> Hi Ezra,
> 
> On 05.05.20 09:10, Ezra Buehler wrote:
>> On 5 May 2020, at 08:45, Stefan Roese <sr@denx.de> wrote:
>>> U-Boot specific DT properties, like "u-boot,dm-pre-reloc" should be
>>> added in U-Boot specific DT dtsi files
>> OK, that makes sense. However, in your commit 1718a9f3b7 (arm: mvebu:
>> armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs") you
>> wrote:
>>   I'm not adding this property in an *u-boot.dtsi file, since there is
>>   none matching the generic rules for all files including this dtsi
>>   file. So to not miss any of the boards using this dtsi file, I'm
>>   adding it to this file directly, which makes the Linux merge a less
>>   easy unforunately.
>> So, do you want me to try this now?
> 
> Hmmm, I can't remember the exact details. Thanks for the reference.
> But perhaps there is a matching *-u-boot.dtsi rule / pattern that can
> be used to include such a newly introduced file. I would very much
> welcome it, when you would investigate here.
> 
> Thanks,
> Stefan

From looking at other *.dtsi files I understand one would have to
include the armada-370-xp-u-boot.dtsi in armada-370-xp.dtsi in order to
move the U-Boot-specific properties out. I guess one should then do this
for other boards too. I am not sure if I am confortable with touching
all these boards. Maybe one should do this the next time when syncing
the DTS files with Linux.

If it is OK for you, for this patch, I would simply introduce a
armada-xp-synology-ds414-u-boot.dtsi as Chris suggested.

Cheers,
Ezra.

[PATCH 1/2] arm: mvebu: armada-370-xp.dtsi: add u-boot,dm-pre-reloc to spi0

[Stefan Roese]

Hi Ezra,

On 09.05.20 10:10, Ezra Buehler wrote:
> On 5 May 2020, at 10:58, Stefan Roese <sr@denx.de> wrote:
>>
>> Hi Ezra,
>>
>> On 05.05.20 09:10, Ezra Buehler wrote:
>>> On 5 May 2020, at 08:45, Stefan Roese <sr@denx.de> wrote:
>>>> U-Boot specific DT properties, like "u-boot,dm-pre-reloc" should be
>>>> added in U-Boot specific DT dtsi files
>>> OK, that makes sense. However, in your commit 1718a9f3b7 (arm: mvebu:
>>> armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs") you
>>> wrote:
>>>    I'm not adding this property in an *u-boot.dtsi file, since there is
>>>    none matching the generic rules for all files including this dtsi
>>>    file. So to not miss any of the boards using this dtsi file, I'm
>>>    adding it to this file directly, which makes the Linux merge a less
>>>    easy unforunately.
>>> So, do you want me to try this now?
>>
>> Hmmm, I can't remember the exact details. Thanks for the reference.
>> But perhaps there is a matching *-u-boot.dtsi rule / pattern that can
>> be used to include such a newly introduced file. I would very much
>> welcome it, when you would investigate here.
>>
>> Thanks,
>> Stefan
> 
>  From looking at other *.dtsi files I understand one would have to
> include the armada-370-xp-u-boot.dtsi in armada-370-xp.dtsi in order to
> move the U-Boot-specific properties out. I guess one should then do this
> for other boards too. I am not sure if I am confortable with touching
> all these boards. Maybe one should do this the next time when syncing
> the DTS files with Linux.
> 
> If it is OK for you, for this patch, I would simply introduce a
> armada-xp-synology-ds414-u-boot.dtsi as Chris suggested.

Yes, please continue this way.

Thanks,
Stefan