Skip to contentSkip to conversation

ARM: dts: omap3-n9 family: mark proper OMAP version

PATCH In review Nishanth Menon 2 participants 3 messages Feb 11, 2014 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: omap3-n9 family: mark proper OMAP version

Nokia N900 uses OMAP3430 and N9/N950 uses OMAP3630. Mark SoC compatibilty as per Documentation/devicetree/bindings/arm/omap/omap.txt else N9/N950 will be probed as a OMAP3430 type device, since default ti,omap3 maps to OMAP3430 compatibility.

---

just build tested. but given examples such as
http://thread.gmane.org/gmane.linux.ports.arm.omap/110006

I guess, some form of failure is expected.

based on v3.14-rc2

 arch/arm/boot/dts/omap3-n9.dts   |    2 +-
 arch/arm/boot/dts/omap3-n900.dts |    2 +-
 arch/arm/boot/dts/omap3-n950.dts |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap3-n9.dts +1 -1
index 39828ce..9938b5d 100644
@@ -14,5 +14,5 @@
 
 / {
 	model = "Nokia N9";
-	compatible = "nokia,omap3-n9", "ti,omap3";
+	compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
 };
arch/arm/boot/dts/omap3-n900.dts +1 -1
index 6fc85f9..97db027 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Nokia N900";
-	compatible = "nokia,omap3-n900", "ti,omap3";
+	compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
 
 	cpus {
 		cpu at 0 {
arch/arm/boot/dts/omap3-n950.dts +1 -1
index b076a52..261c558 100644
@@ -14,5 +14,5 @@
 
 / {
 	model = "Nokia N950";
-	compatible = "nokia,omap3-n950", "ti,omap3";
+	compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
 };
Signature · 1 line
1.7.9.5
#1 lore raw

Hi,

Quoted 4 lines · Nishanth Menon

Nokia N900 uses OMAP3430 and N9/N950 uses OMAP3630. Mark SoC compatibilty as per Documentation/devicetree/bindings/arm/omap/omap.txt else N9/N950 will be probed as a OMAP3430 type device, since default ti,omap3 maps to OMAP3430 compatibility.

I already sent & tested patches for this:

http://marc.info/?l=linux-omap&m=139194800711362&w=2
http://marc.info/?l=linux-omap&m=139194800011360&w=2

The N9/N950 is mandatory for 3.14, as the boot hangs without it.

A.

Quoted 58 lines

---

just build tested. but given examples such as
http://thread.gmane.org/gmane.linux.ports.arm.omap/110006

I guess, some form of failure is expected.

based on v3.14-rc2

 arch/arm/boot/dts/omap3-n9.dts   |    2 +-
 arch/arm/boot/dts/omap3-n900.dts |    2 +-
 arch/arm/boot/dts/omap3-n950.dts |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap3-n9.dts +1 -1
index 39828ce..9938b5d 100644
@@ -14,5 +14,5 @@
 
 / {
 	model = "Nokia N9";
-	compatible = "nokia,omap3-n9", "ti,omap3";
+	compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
 };
arch/arm/boot/dts/omap3-n900.dts +1 -1
index 6fc85f9..97db027 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Nokia N900";
-	compatible = "nokia,omap3-n900", "ti,omap3";
+	compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
 
 	cpus {
 		cpu at 0 {
arch/arm/boot/dts/omap3-n950.dts +1 -1
index b076a52..261c558 100644
@@ -14,5 +14,5 @@
 
 / {
 	model = "Nokia N950";
-	compatible = "nokia,omap3-n950", "ti,omap3";
+	compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
 };
Signature · 6 lines
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw

Aaro,

Quoted 8 lines · Aaro Koskinen

Hi,

Quoted 4 lines · Nishanth Menon

Nokia N900 uses OMAP3430 and N9/N950 uses OMAP3630. Mark SoC compatibilty as per Documentation/devicetree/bindings/arm/omap/omap.txt else N9/N950 will be probed as a OMAP3430 type device, since default ti,omap3 maps to OMAP3430 compatibility.

Quoted 6 lines

I already sent & tested patches for this:

http://marc.info/?l=linux-omap&m=139194800711362&w=2
http://marc.info/?l=linux-omap&m=139194800011360&w=2

The N9/N950 is mandatory for 3.14, as the boot hangs without it.

Thanks. Apologies on missing these, I caught these based on a git grep on an unrelated thing.. I will ack your patches - they are obvious regressions.

Signature · 2 lines
Regards,
Nishanth Menon