Skip to contentSkip to conversation

arm: mvebu: armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs"

PATCH New Stefan Roese 2 participants 5 messages May 10, 2019 – May 20, 2019 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: mvebu: armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs"

Without this U-Boot specific property, booting on Armada XP theadorable fails in SPL. All nodes in the "internal-regs" (simple-bus) DT node are not scanned, so the UART node is missing (and others).

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.

Cc Chris Packham <[email protected]>
Cc Marek Behún <[email protected]>
---
 arch/arm/dts/armada-370-xp.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/armada-370-xp.dtsi +1 -0
index e4c35d4e98..50fc0be9f7 100644
@@ -102,6 +102,7 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
+			u-boot,dm-pre-reloc;
 
 			rtc: rtc at 10300 {
 				compatible = "marvell,orion-rtc";
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 arm: mvebu: armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs"

Quoted 10 lines · Stefan Roese,

Without this U-Boot specific property, booting on Armada XP theadorable fails in SPL. All nodes in the "internal-regs" (simple-bus) DT node are not scanned, so the UART node is missing (and others).

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.

Quoted 4 lines
Cc Chris Packham <[email protected]>
Cc Marek Behún <[email protected]>

Thanks. Is this a regression from my last sync? The only Armada XP like platform I had access to was msys and that doesn't use SPL (yet).

---

Quoted 20 lines
 arch/arm/dts/armada-370-xp.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/armada-370-xp.dtsi +1 -1
index e4c35d4e98..50fc0be9f7 100644
@@ -102,6 +102,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
+                       u-boot,dm-pre-reloc;
 
                        rtc: rtc at 10300 {
                                compatible = "marvell,orion-rtc";
--

2.21.0

#2 lore raw

PATCH 1/1 arm: mvebu: armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs"

Quoted 14 lines · Chris Packham

On Fri, 10 May 2019, 11:34 PM Stefan Roese, <sr at denx.de <mailto:[email protected]>> wrote:

Without this U-Boot specific property, booting on Armada XP theadorable fails in SPL. All nodes in the "internal-regs" (simple-bus) DT node are not scanned, so the UART node is missing (and others).

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.

Quoted 7 lines
Signed-off-by Stefan Roese <sr at denx.de <mailto:[email protected]>>
Cc Chris Packham <judge.packham at gmail.com <mailto:[email protected]>>
Cc Marek Behún <marek.behun at nic.cz <mailto:[email protected]>>

Thanks. Is this a regression from my last sync? The only Armada XP like platform I had access to was msys and that doesn't use SPL (yet).

I'm not 100% sure if its only a regression caused by your DT sync or also by this patch:

c7a88dae "dm: remove pre reloc properties in SPL and TPL device tree"

I stopped debugging at some point, once I had the node enabled in the SPL DT again.

Quoted 1 line
Reviewed-by Chris Packham <judge.packham at gmail.com <mailto:[email protected]>>

Thanks,
Stefan

#3 lore raw

PATCH 1/1 arm: mvebu: armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs"

Quoted 24 lines · Stefan Roese
Quoted 14 lines · Chris Packham

On Fri, 10 May 2019, 11:34 PM Stefan Roese, <sr at denx.de <mailto:[email protected]>> wrote:

Without this U-Boot specific property, booting on Armada XP theadorable fails in SPL. All nodes in the "internal-regs" (simple-bus) DT node are not scanned, so the UART node is missing (and others).

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.

Quoted 7 lines
Signed-off-by Stefan Roese <sr at denx.de <mailto:[email protected]>>
Cc Chris Packham <judge.packham at gmail.com <mailto:[email protected]>>
Cc Marek Behún <marek.behun at nic.cz <mailto:[email protected]>>

Thanks. Is this a regression from my last sync? The only Armada XP like platform I had access to was msys and that doesn't use SPL (yet).

Quoted 9 lines

I'm not 100% sure if its only a regression caused by your DT sync or also by this patch:

c7a88dae "dm: remove pre reloc properties in SPL and TPL device tree"

I stopped debugging at some point, once I had the node enabled in the SPL DT again.

Quoted 1 line
Reviewed-by Chris Packham <judge.packham at gmail.com <mailto:[email protected]>>

^^^ Gah, this is from the gmail app on my tablet it seems intent on linkifying things now. This has been known to make the patchwork client spew html into the patch when you download it.

#4 lore raw

PATCH 1/1 arm: mvebu: armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs"

In reply to Stefan Roese
Quoted 10 lines · Stefan Roese

Without this U-Boot specific property, booting on Armada XP theadorable fails in SPL. All nodes in the "internal-regs" (simple-bus) DT node are not scanned, so the UART node is missing (and others).

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.

Quoted 3 lines
Cc Chris Packham <[email protected]>
Cc Marek Behún <[email protected]>

Applied to u-boot-marvell/master.

Thanks,
Stefan