Skip to contentSkip to conversation

ARM: dts: Fix missing "device_type" in Aspeed memory nodes

PATCH New Benjamin Herrenschmidt 2 participants 2 messages Jan 12, 2018 – Jan 15, 2018

Subsystems (2)
Device tree bindings Arm/Aspeed machine support
lore
Share & tools
lore

Benjamin Herrenschmidt

author
#0 lore raw

PATCH 1/1 ARM: dts: Fix missing "device_type" in Aspeed memory nodes

When Joel removed skeleton.dtsi, the Aspeed boards lost their "device_type" property in the memory node. Since a number of these still use old bootloaders that won't patch it properly, booting breaks as a result.

This adds the property back to the individual nodes.

Signed-off-by Benjamin Herrenschmidt <[email protected]>

---

Should we just have a skeleton in the g4 and g5 dtsi with just that property instead ?

---
 arch/arm/boot/dts/aspeed-ast2500-evb.dts         | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts    | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 1 +
 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts     | 1 +
 6 files changed, 6 insertions(+)
arch/arm/boot/dts/aspeed-ast2500-evb.dts +1 -0
index ede11c597673..0c3f14d05046 100644
@@ -17,6 +17,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +1 -0
index 4379d09a261f..9d18cce971be 100644
@@ -13,6 +13,7 @@
 	};
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x20000000>;
 	};
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1 -0
index 623b6ab42021..cd06d5738782 100644
@@ -13,6 +13,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +1 -0
index 5f9049d2c4c3..b64553a083b0 100644
@@ -14,6 +14,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +1 -0
index c881484a85cf..f3f5b3279e52 100644
@@ -13,6 +13,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts +1 -0
index 76aa6ea1f988..ca7a4ae9ed08 100644
@@ -13,6 +13,7 @@
 	};
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x8000000>;
 	};
maintainer
#1 lore raw

PATCH 1/1 ARM: dts: Fix missing "device_type" in Aspeed memory nodes

Quoted 5 lines · Benjamin Herrenschmidt

When Joel removed skeleton.dtsi, the Aspeed boards lost their "device_type" property in the memory node. Since a number of these still use old bootloaders that won't patch it properly, booting breaks as a result.

Quoted 7 lines

This adds the property back to the individual nodes.

Signed-off-by Benjamin Herrenschmidt <[email protected]>

---

Should we just have a skeleton in the g4 and g5 dtsi with just that property instead ?

I like this option better. That way future boards don't need to remember to add this. Can you send a v2 please?

Thanks for the patch. I assume I missed this as I normally use a device tree aware boot where u-boot populates the memory node for us.

Cheers,

Joel

Quoted 88 lines
---
 arch/arm/boot/dts/aspeed-ast2500-evb.dts         | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts    | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 1 +
 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts     | 1 +
 6 files changed, 6 insertions(+)
arch/arm/boot/dts/aspeed-ast2500-evb.dts +1 -0
index ede11c597673..0c3f14d05046 100644
@@ -17,6 +17,7 @@
        };
 
        memory at 80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 };
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +1 -0
index 4379d09a261f..9d18cce971be 100644
@@ -13,6 +13,7 @@
        };
 
        memory at 40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x20000000>;
        };
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1 -0
index 623b6ab42021..cd06d5738782 100644
@@ -13,6 +13,7 @@
        };
 
        memory at 80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +1 -0
index 5f9049d2c4c3..b64553a083b0 100644
@@ -14,6 +14,7 @@
        };
 
        memory at 80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +1 -0
index c881484a85cf..f3f5b3279e52 100644
@@ -13,6 +13,7 @@
        };
 
        memory at 80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts +1 -0
index 76aa6ea1f988..ca7a4ae9ed08 100644
@@ -13,6 +13,7 @@
        };
 
        memory at 40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x8000000>;
        };

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel