Skip to contentSkip to conversation

fdt: fix bcm283x dm-pre-reloc definitions

PATCH Superseded matthias.bgg at kernel.org 3 participants 3 messages Nov 7, 2019

Subsystems (3)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fdt: fix bcm283x dm-pre-reloc definitions

From: Matthias Brugger <[email protected]>

In commmit
143256b353 ("fdt: update bcm283x device tree sources to Linux 5.1-rc6 state") we accidently deleted the inclution of bcm283x-uboot.dtsi which marks, soc, uarts and pincontroller as dm-pre-reloc

Without this definitions the first call to bcm283x_mu_serial_ofdata_to_platdata() fails as the pins are not set correctly. As a result the U-Boot banner isn't shown on boot.

---

 arch/arm/dts/bcm283x.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/dts/bcm283x.dtsi +3 -1
index 9777644c6c..39d7bd600e 100644
@@ -51,7 +51,7 @@
 		};
 	};
 
-	soc {
+	soc: soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -675,3 +675,5 @@
 		#phy-cells = <0>;
 	};
 };
+
+#include "bcm283x-uboot.dtsi"
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 fdt: fix bcm283x dm-pre-reloc definitions

Quoted 25 lines · matthias.bgg at kernel.org

From: Matthias Brugger <[email protected]>

In commmit
143256b353 ("fdt: update bcm283x device tree sources to Linux 5.1-rc6 state") we accidently deleted the inclution of bcm283x-uboot.dtsi which marks, soc, uarts and pincontroller as dm-pre-reloc

Without this definitions the first call to bcm283x_mu_serial_ofdata_to_platdata() fails as the pins are not set correctly. As a result the U-Boot banner isn't shown on boot.

---

 arch/arm/dts/bcm283x.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/dts/bcm283x.dtsi +0 -0
index 9777644c6c..39d7bd600e 100644

arch/arm/dts/bcm283x.dtsi line 57

Quoted 8 lines
arch/arm/dts/bcm283x.dtsi +1 -1
@@ -51,7 +51,7 @@
 		};
 	};
 
-	soc {
+	soc: soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;

Is that part needed?

arch/arm/dts/bcm283x.dtsi line 679

Quoted 6 lines
arch/arm/dts/bcm283x.dtsi +2 -0
@@ -675,3 +675,5 @@
 		#phy-cells = <0>;
 	};
 };
+
+#include "bcm283x-uboot.dtsi"

This means one of the general rules we have in:

u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \
        $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \
        $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \
        $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \
        $(wildcard $(dir $<)u-boot.dtsi))

isn't being hit and we should probably rename the file (or set CONFIG_SYS_SOC differently?).

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191107/5490f2a5/attachment.sig>
#2 lore raw

PATCH 1/1 fdt: fix bcm283x dm-pre-reloc definitions

Quoted 30 lines · Tom Rini
Quoted 28 lines · matthias.bgg at kernel.org

From: Matthias Brugger <[email protected]>

In commmit
143256b353 ("fdt: update bcm283x device tree sources to Linux 5.1-rc6 state") we accidently deleted the inclution of bcm283x-uboot.dtsi which marks, soc, uarts and pincontroller as dm-pre-reloc

Without this definitions the first call to bcm283x_mu_serial_ofdata_to_platdata() fails as the pins are not set correctly. As a result the U-Boot banner isn't shown on boot.

---

 arch/arm/dts/bcm283x.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/dts/bcm283x.dtsi +0 -0
index 9777644c6c..39d7bd600e 100644
@@ -51,7 +51,7 @@
 		};
 	};
 
Quoted 8 lines

arch/arm/dts/bcm283x.dtsi line 57

Quoted 5 lines
arch/arm/dts/bcm283x.dtsi +1 -1
-	soc {
+	soc: soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;

Is that part needed?

I verified that this is not needed.
Will update in v2.

Quoted 8 lines

arch/arm/dts/bcm283x.dtsi line 679

Quoted 6 lines
arch/arm/dts/bcm283x.dtsi +2 -0
@@ -675,3 +675,5 @@
 		#phy-cells = <0>;
 	};
 };
+
+#include "bcm283x-uboot.dtsi"

This means one of the general rules we have in:

Quoted 9 lines
u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \
        $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \
        $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \
        $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \
        $(wildcard $(dir $<)u-boot.dtsi))

isn't being hit and we should probably rename the file (or set CONFIG_SYS_SOC differently?).

Good catch. I'll send a v2 which fixes this by renaming the file.

Regards,
Matthias