ARM: dts: Fixes for Overo/Tobi against 3.14-rc2
v2 cover ARM: dts: Fixes for Overo/Tobi against 3.14-rc2
OMAP36xx-based Overo (Storm and alike) are now failing to boot with 3.14-rc2 [1]. This series fixes this, by moving model-agnostic DT into a common dtsi file, and creating model-specific DT files:
- omap3-overo-tobi.dts -> older OMAP35xx Overo
- omap3-overo-storm-tobi.dts -> newer OMAP36xx/AM37xx/DM37xx Overo
People will have to use the right Overo / expansion board combination.
(Patch 2 in an unrelated fix that was waiting in my queue.)
omap3-overo-tobi.dts tested with Overo Sand (OMAP3503) and omap3-overo-storm-tobi.dts tested with Overo EarthStorm (AM3703). Both boot. With the Overo Sand, I cannot mount the ext3 rootfs, but this seems unrelated to the current topic, maybe a missing errata.
Regards,
Florian
Changes since v1:
- Add "ti,omap3430" as a compatible string for OMAP35xx-based Overo
- Update the DT documentation to silence out checkpatch warnings (patch 4)
[1] http://thread.gmane.org/gmane.linux.ports.arm.omap/110006
Florian Vaussard (4):
ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
ARM: dts: omap3-tobi: Use the correct vendor prefix
ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
Documentation: dt: OMAP: Update Overo/Tobi
.../devicetree/bindings/arm/omap/omap.txt | 2 +-
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 22 ++++++++++++++++++++++
...omap3-tobi.dts => omap3-overo-tobi-common.dtsi} | 3 ---
arch/arm/boot/dts/omap3-overo-tobi.dts | 22 ++++++++++++++++++++++
arch/arm/boot/dts/omap3-overo.dtsi | 3 ---
6 files changed, 47 insertions(+), 8 deletions(-)
create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobi.dts
rename arch/arm/boot/dts/{omap3-tobi.dts => omap3-overo-tobi-common.dtsi} (94%)
create mode 100644 arch/arm/boot/dts/omap3-overo-tobi.dtsSignature · 1 line
1.8.1.2
PATCH v2 1/4 ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
Tobi expansion board can be used with both OMAP35xx-based Overo, and OMAP36xx-based Overo. Currently the boot is broken with newer OMAP36xx-based Overo (Storm and alike). Fix include file and compatible string to be able to boot newer models.
This will break older models. This will be addressed later.
--- arch/arm/boot/dts/omap3-overo.dtsi | 3 --- arch/arm/boot/dts/omap3-tobi.dts | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/omap3-overo.dtsi +0 -3
@@ -9,9 +9,6 @@ /* * The Gumstix Overo must be combined with an expansion board. */ -/dts-v1/; - -#include "omap34xx.dtsi" / { pwmleds {
arch/arm/boot/dts/omap3-tobi.dts +4 -1
@@ -10,11 +10,14 @@ * Tobi expansion board is manufactured by Gumstix Inc. */ +/dts-v1/; + +#include "omap36xx.dtsi" #include "omap3-overo.dtsi" / { model = "TI OMAP3 Gumstix Overo on Tobi"; - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"; + compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap36xx", "ti,omap3"; leds { compatible = "gpio-leds";
Signature · 1 line
1.8.1.2
PATCH v2 1/4 ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
Quoted 10 lines · Florian Vaussard
Tobi expansion board can be used with both OMAP35xx-based Overo, and OMAP36xx-based Overo. Currently the boot is broken with newer OMAP36xx-based Overo (Storm and alike). Fix include file and compatible string to be able to boot newer models.
This will break older models. This will be addressed later.
Signed-off-by Tony Lindgren <[email protected]>Signed-off-by Florian Vaussard <[email protected]>Tested-by Kevin Hilman <[email protected]>
Quoted 40 lines
--- arch/arm/boot/dts/omap3-overo.dtsi | 3 --- arch/arm/boot/dts/omap3-tobi.dts | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-)arch/arm/boot/dts/omap3-overo.dtsi +0
-3@@ -9,9 +9,6 @@ /* * The Gumstix Overo must be combined with an expansion board. */ -/dts-v1/; - -#include "omap34xx.dtsi" / { pwmleds {arch/arm/boot/dts/omap3-tobi.dts +4
-1@@ -10,11 +10,14 @@ * Tobi expansion board is manufactured by Gumstix Inc. */ +/dts-v1/; + +#include "omap36xx.dtsi" #include "omap3-overo.dtsi" / { model = "TI OMAP3 Gumstix Overo on Tobi"; - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"; + compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap36xx", "ti,omap3"; leds { compatible = "gpio-leds";
Signature · 2 lines
Regards, Nishanth Menon
PATCH v2 2/4 ARM: dts: omap3-tobi: Use the correct vendor prefix
In reply to Florian VaussardGumstix is the correct vendor for all Overo related products.
--- arch/arm/boot/dts/omap3-tobi.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3-tobi.dts +1 -1
@@ -17,7 +17,7 @@ / { model = "TI OMAP3 Gumstix Overo on Tobi"; - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap36xx", "ti,omap3"; + compatible = "gumstix,omap3-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3"; leds { compatible = "gpio-leds";
Signature · 1 line
1.8.1.2
PATCH v2 2/4 ARM: dts: omap3-tobi: Use the correct vendor prefix
Quoted 4 lines · Florian Vaussard
Gumstix is the correct vendor for all Overo related products.
Reported-by Javier Martinez Canillas <[email protected]>Signed-off-by Florian Vaussard <[email protected]>
Quoted 18 lines
--- arch/arm/boot/dts/omap3-tobi.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/boot/dts/omap3-tobi.dts +1
-1@@ -17,7 +17,7 @@ / { model = "TI OMAP3 Gumstix Overo on Tobi"; - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap36xx", "ti,omap3"; + compatible = "gumstix,omap3-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3"; leds { compatible = "gpio-leds";
Signature · 2 lines
Regards, Nishanth Menon
PATCH v2 3/4 ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
In reply to Florian VaussardUnfortunatly the device tree for older OMAP35xx Overo cannot be used with newer OMAP36xx and vice-versa. To address this issue, move most of the Tobi DTS to a common include file, and create model-specific Tobi DTS.
---
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 22 ++++++++++++++++++++++
...omap3-tobi.dts => omap3-overo-tobi-common.dtsi} | 6 ------
arch/arm/boot/dts/omap3-overo-tobi.dts | 22 ++++++++++++++++++++++
4 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobi.dts
rename arch/arm/boot/dts/{omap3-tobi.dts => omap3-overo-tobi-common.dtsi} (91%)
create mode 100644 arch/arm/boot/dts/omap3-overo-tobi.dtsarch/arm/boot/dts/Makefile +2 -1
@@ -208,7 +208,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-n900.dtb \ omap3-n9.dtb \ omap3-n950.dtb \ - omap3-tobi.dtb \ + omap3-overo-tobi.dtb \ + omap3-overo-storm-tobi.dtb \ omap3-gta04.dtb \ omap3-igep0020.dtb \ omap3-igep0030.dtb \
arch/arm/boot/dts/omap3-overo-storm-tobi.dts new file +22 -0
@@ -0,0 +1,22 @@ +/* + * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* + * Tobi expansion board is manufactured by Gumstix Inc. + */ + +/dts-v1/; + +#include "omap36xx.dtsi" +#include "omap3-overo-tobi-common.dtsi" + +/ { + model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Tobi"; + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3"; +}; +
arch/arm/boot/dts/omap3-overo-tobi-common.dtsi renamed from arch/arm/boot/dts/omap3-tobi.dts +0 -6
@@ -10,15 +10,9 @@ * Tobi expansion board is manufactured by Gumstix Inc. */ -/dts-v1/; - -#include "omap36xx.dtsi" #include "omap3-overo.dtsi" / { - model = "TI OMAP3 Gumstix Overo on Tobi"; - compatible = "gumstix,omap3-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3"; - leds { compatible = "gpio-leds"; heartbeat {
arch/arm/boot/dts/omap3-overo-tobi.dts new file +22 -0
@@ -0,0 +1,22 @@ +/* + * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* + * Tobi expansion board is manufactured by Gumstix Inc. + */ + +/dts-v1/; + +#include "omap34xx.dtsi" +#include "omap3-overo-tobi-common.dtsi" + +/ { + model = "OMAP35xx Gumstix Overo on Tobi"; + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"; +}; +
Signature · 1 line
1.8.1.2
PATCH v2 3/4 ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
Quoted 7 lines · Florian Vaussard
Unfortunatly the device tree for older OMAP35xx Overo cannot be used with newer OMAP36xx and vice-versa. To address this issue, move most of the Tobi DTS to a common include file, and create model-specific Tobi DTS.
Signed-off-by Florian Vaussard <[email protected]>Tested-by Kevin Hilman <[email protected]>
Quoted 104 lines
--- arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 22 ++++++++++++++++++++++ ...omap3-tobi.dts => omap3-overo-tobi-common.dtsi} | 6 ------ arch/arm/boot/dts/omap3-overo-tobi.dts | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobi.dts rename arch/arm/boot/dts/{omap3-tobi.dts => omap3-overo-tobi-common.dtsi} (91%) create mode 100644 arch/arm/boot/dts/omap3-overo-tobi.dtsarch/arm/boot/dts/Makefile +2
-1@@ -208,7 +208,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-n900.dtb \ omap3-n9.dtb \ omap3-n950.dtb \ - omap3-tobi.dtb \ + omap3-overo-tobi.dtb \ + omap3-overo-storm-tobi.dtb \ omap3-gta04.dtb \ omap3-igep0020.dtb \ omap3-igep0030.dtb \arch/arm/boot/dts/omap3-overo-storm-tobi.dts new file +22
-0@@ -0,0 +1,22 @@ +/* + * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* + * Tobi expansion board is manufactured by Gumstix Inc. + */ + +/dts-v1/; + +#include "omap36xx.dtsi" +#include "omap3-overo-tobi-common.dtsi" + +/ { + model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Tobi"; + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3"; +}; +arch/arm/boot/dts/omap3-overo-tobi-common.dtsi renamed from arch/arm/boot/dts/omap3-tobi.dts +0
-6@@ -10,15 +10,9 @@ * Tobi expansion board is manufactured by Gumstix Inc. */ -/dts-v1/; - -#include "omap36xx.dtsi" #include "omap3-overo.dtsi" / { - model = "TI OMAP3 Gumstix Overo on Tobi"; - compatible = "gumstix,omap3-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3"; - leds { compatible = "gpio-leds"; heartbeat {arch/arm/boot/dts/omap3-overo-tobi.dts new file +22
-0@@ -0,0 +1,22 @@ +/* + * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* + * Tobi expansion board is manufactured by Gumstix Inc. + */ + +/dts-v1/; + +#include "omap34xx.dtsi" +#include "omap3-overo-tobi-common.dtsi" + +/ { + model = "OMAP35xx Gumstix Overo on Tobi"; + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"; +}; +
Signature · 2 lines
Regards, Nishanth Menon
PATCH v2 4/4 Documentation: dt: OMAP: Update Overo/Tobi
In reply to Florian VaussardUpdate the compatible string for Overo/Tobi to reflect the latest changes.
--- Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/omap/omap.txt +1 -1
@@ -91,7 +91,7 @@ Boards: compatible = "ti,omap3-beagle", "ti,omap3" - OMAP3 Tobi with Overo : Commercial expansion board with daughter board - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3" + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3" - OMAP4 SDP : Software Development Board compatible = "ti,omap4-sdp", "ti,omap4430"
Signature · 1 line
1.8.1.2
PATCH v2 4/4 Documentation: dt: OMAP: Update Overo/Tobi
Quoted 13 lines · Florian Vaussard
Update the compatible string for Overo/Tobi to reflect the latest changes.
Signed-off-by Florian Vaussard <[email protected]>--- Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/devicetree/bindings/arm/omap/omap.txt +0
-0
Documentation/devicetree/bindings/arm/omap/omap.txt Boards: · line 94
Quoted 5 lines
Documentation/devicetree/bindings/arm/omap/omap.txt +1
-1@@ -91,7 +91,7 @@ Boards: compatible = "ti,omap3-beagle", "ti,omap3" - OMAP3 Tobi with Overo : Commercial expansion board with daughter board - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3" + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"
omap3-overo-storm-tobi.dts is not covered here, so, I wonder as the number of boards supported keep increasing, is'nt it better we drop the board information from omap.txt?
Quoted 4 lines
Documentation/devicetree/bindings/arm/omap/omap.txt +0
-0- OMAP4 SDP : Software Development Board compatible = "ti,omap4-sdp", "ti,omap4430"
Signature · 2 lines
Regards, Nishanth Menon
PATCH v2 4/4 Documentation: dt: OMAP: Update Overo/Tobi
Hi,
Quoted 16 lines · Nishanth Menon
Quoted 15 lines · Florian Vaussard
Update the compatible string for Overo/Tobi to reflect the latest changes.
Signed-off-by Florian Vaussard <[email protected]>--- Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/devicetree/bindings/arm/omap/omap.txt +0
-0@@ -91,7 +91,7 @@ Boards: compatible = "ti,omap3-beagle", "ti,omap3"
Quoted 7 lines
Documentation/devicetree/bindings/arm/omap/omap.txt Boards: · line 94
Quoted 3 lines
Documentation/devicetree/bindings/arm/omap/omap.txt +1
-1- OMAP3 Tobi with Overo : Commercial expansion board with daughter board - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3" + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"
omap3-overo-storm-tobi.dtsis not covered here, so, I wonder as the number of boards supported keep increasing, is'nt it better we drop the board information from omap.txt?
I am not opposed to this. We will just have checkpatch warnings due to undocumented compatible strings.
Regards,
Florian
PATCH v2 4/4 Documentation: dt: OMAP: Update Overo/Tobi
Quoted 27 lines · Florian Vaussard
Hi,
Quoted 16 lines · Nishanth Menon
Quoted 15 lines · Florian Vaussard
Update the compatible string for Overo/Tobi to reflect the latest changes.
Signed-off-by Florian Vaussard <[email protected]>--- Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/devicetree/bindings/arm/omap/omap.txt +0
-0@@ -91,7 +91,7 @@ Boards: compatible = "ti,omap3-beagle", "ti,omap3"Quoted 7 lines
Documentation/devicetree/bindings/arm/omap/omap.txt Boards: · line 94
Quoted 3 lines
Documentation/devicetree/bindings/arm/omap/omap.txt +1
-1- OMAP3 Tobi with Overo : Commercial expansion board with daughter board - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3" + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"
omap3-overo-storm-tobi.dtsis not covered here, so, I wonder as the number of boards supported keep increasing, is'nt it better we drop the board information from omap.txt?
Quoted 2 lines
I am not opposed to this. We will just have checkpatch warnings due to undocumented compatible strings.
Aaah, I seemed to have missed bff5da43 commit, thanks for pointing me at it - unrelated to this patch, I think the board cleanups is a little overdue :(
Signature · 2 lines
Regards, Nishanth Menon
PATCH v2 4/4 Documentation: dt: OMAP: Update Overo/Tobi
Quoted 28 lines · Nishanth Menon
Quoted 27 lines · Florian Vaussard
Hi,
Quoted 23 lines · Nishanth Menon
Quoted 13 lines · Florian Vaussard
Update the compatible string for Overo/Tobi to reflect the latest changes.
Signed-off-by Florian Vaussard <[email protected]>--- Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/devicetree/bindings/arm/omap/omap.txt +0
-0Documentation/devicetree/bindings/arm/omap/omap.txt Boards: · line 94
Quoted 5 lines
Documentation/devicetree/bindings/arm/omap/omap.txt +1
-1@@ -91,7 +91,7 @@ Boards: compatible = "ti,omap3-beagle", "ti,omap3" - OMAP3 Tobi with Overo : Commercial expansion board with daughter board - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3" + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"
omap3-overo-storm-tobi.dtsis not covered here, so, I wonder as the number of boards supported keep increasing, is'nt it better we drop the board information from omap.txt?
Quoted 8 lines
Quoted 2 lines
I am not opposed to this. We will just have checkpatch warnings due to undocumented compatible strings.
Aaah, I seemed to have missed
bff5da43commit, thanks for pointing me at it - unrelated to this patch, I think the board cleanups is a little overdue :(Acked-by Nishanth Menon <[email protected]>
OK thanks picking up this too.
Tony
v2 cover ARM: dts: Fixes for Overo/Tobi against 3.14-rc2
In reply to Florian VaussardQuoted 7 lines · Florian Vaussard
OMAP36xx-based Overo (Storm and alike) are now failing to boot with 3.14-rc2 [1]. This series fixes this, by moving model-agnostic DT into a common dtsi file, and creating model-specific DT files:
-
omap3-overo-tobi.dts-> older OMAP35xx Overo
-omap3-overo-storm-tobi.dts-> newer OMAP36xx/AM37xx/DM37xx Overo
Quoted 8 lines
People will have to use the right Overo / expansion board combination.
(Patch 2 in an unrelated fix that was waiting in my queue.)
omap3-overo-tobi.dtstested with Overo Sand (OMAP3503) andomap3-overo-storm-tobi.dtstested with Overo EarthStorm (AM3703). Both boot. With the Overo Sand, I cannot mount the ext3 rootfs, but this seems unrelated to the current topic, maybe a missing errata.
Applying patches 1 to 3 into omap-for-v3.14/fixes thanks, the last one still seems to have discussion going.
Tony