[PATCH 0/3] ARM: dts: Fixes for Overo/Tobi against 3.14-rc1

[PATCH 0/3] ARM: dts: Fixes for Overo/Tobi against 3.14-rc1

[Florian Vaussard]

OMAP36xx-based Overo (Storm and alike) are now failing to boot with 3.14-rc1 [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

[1] http://thread.gmane.org/gmane.linux.ports.arm.omap/110006


Florian Vaussard (3):
  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

 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 ---
 5 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} (94%)
 create mode 100644 arch/arm/boot/dts/omap3-overo-tobi.dts

-- 
1.8.1.2

[PATCH 1/3] ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo

[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 <tony@atomide.com>
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
---
 arch/arm/boot/dts/omap3-overo.dtsi | 3 ---
 arch/arm/boot/dts/omap3-tobi.dts   | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi
index a461d2f..5970999 100644
--- a/arch/arm/boot/dts/omap3-overo.dtsi
+++ b/arch/arm/boot/dts/omap3-overo.dtsi
@@ -9,9 +9,6 @@
 /*
  * The Gumstix Overo must be combined with an expansion board.
  */
-/dts-v1/;
-
-#include "omap34xx.dtsi"
 
 / {
 	pwmleds {
diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts
index 7e4ad2a..0e3b8bf 100644
--- a/arch/arm/boot/dts/omap3-tobi.dts
+++ b/arch/arm/boot/dts/omap3-tobi.dts
@@ -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";
-- 
1.8.1.2

[PATCH 2/3] ARM: dts: omap3-tobi: Use the correct vendor prefix

[Florian Vaussard]

Gumstix is the correct vendor for all Overo related products.

Reported-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
---
 arch/arm/boot/dts/omap3-tobi.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts
index 0e3b8bf..c742afa 100644
--- a/arch/arm/boot/dts/omap3-tobi.dts
+++ b/arch/arm/boot/dts/omap3-tobi.dts
@@ -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";
-- 
1.8.1.2

[PATCH 3/3] ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi

[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 <florian.vaussard@epfl.ch>
---
 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.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b9d6a8b..e8355f4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/omap3-overo-storm-tobi.dts b/arch/arm/boot/dts/omap3-overo-storm-tobi.dts
new file mode 100644
index 0000000..966b5c9
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-overo-storm-tobi.dts
@@ -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";
+};
+
diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
similarity index 91%
rename from arch/arm/boot/dts/omap3-tobi.dts
rename to arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
index c742afa..4edc013 100644
--- a/arch/arm/boot/dts/omap3-tobi.dts
+++ b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts b/arch/arm/boot/dts/omap3-overo-tobi.dts
new file mode 100644
index 0000000..2f82192
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-overo-tobi.dts
@@ -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,omap3";
+};
+
-- 
1.8.1.2

[PATCH 3/3] ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi

[Nishanth Menon]

On 02/06/2014 03:10 AM, Florian Vaussard wrote:
> Unfortunatly the device tree for older OMAP35xx Overo cannot be used
Unfortunately ?
> 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.
> 
[...]
> diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts b/arch/arm/boot/dts/omap3-overo-tobi.dts
> new file mode 100644
> index 0000000..2f82192
> --- /dev/null
> +++ b/arch/arm/boot/dts/omap3-overo-tobi.dts
> @@ -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,omap3";
To reduce any future problems, I suggest:
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo",
"ti,omap3430", "ti,omap3";

> +};
> +
> 


-- 
Regards,
Nishanth Menon

[PATCH 3/3] ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi

[Florian Vaussard]

On 02/06/2014 03:35 PM, Nishanth Menon wrote:
> On 02/06/2014 03:10 AM, Florian Vaussard wrote:
>> Unfortunatly the device tree for older OMAP35xx Overo cannot be used
> Unfortunately ?

Indeed

>> 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.
>>
> [...]
>> diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts b/arch/arm/boot/dts/omap3-overo-tobi.dts
>> new file mode 100644
>> index 0000000..2f82192
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/omap3-overo-tobi.dts
>> @@ -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,omap3";
> To reduce any future problems, I suggest:
> compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo",
> "ti,omap3430", "ti,omap3";
> 

This was also my first thought, but "ti,omap3430" is not documented in
Documentation/devicetree/bindings/arm/omap/omap.txt. It is said that
"ti,omap3" defaults to OMAP3430. I do not know if omap35xx would be more
accurate, as these Overo are using OMAP3503 and OMAP3530.

Regards,
Florian

[PATCH 3/3] ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi

[Nishanth Menon]

On 02/06/2014 09:13 AM, Florian Vaussard wrote:
[...]
>>> +#include "omap34xx.dtsi"
>>> +#include "omap3-overo-tobi-common.dtsi"
>>> +
>>> +/ {
>>> +	model = "OMAP35xx Gumstix Overo on Tobi";
>>> +	compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3";
>> To reduce any future problems, I suggest:
>> compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo",
>> "ti,omap3430", "ti,omap3";
>>
> 
> This was also my first thought, but "ti,omap3430" is not documented in
> Documentation/devicetree/bindings/arm/omap/omap.txt. It is said that
> "ti,omap3" defaults to OMAP3430. I do not know if omap35xx would be more
> accurate, as these Overo are using OMAP3503 and OMAP3530.
3430 should have been now documented with commit
89b6eef0d859bad4bcf7ad64560aa2891d6a37a0

http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/arm/omap/omap.txt#n64

We have not pulled out 3730 or 3530 separately out in linux as of
today as they are nothing but a packaging difference for larger board
community - there should be no internal differences - the only
functional variation has been am3517 - which got it's own compatible
property.

-- 
Regards,
Nishanth Menon

[PATCH 0/3] ARM: dts: Fixes for Overo/Tobi against 3.14-rc1

[Kevin Hilman]

Florian Vaussard <florian.vaussard@epfl.ch> writes:

> OMAP36xx-based Overo (Storm and alike) are now failing to boot with 3.14-rc1 [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.

And I tested with my 35xx/Overo with omap3-overo-tobi.dts and my
37xx/Overo STORM with omap3-overo-storm-tobi.dts and they're both
working.

Tested-by: Kevin Hilman <khilman@linaro.org>

Tony, with your ack, I can apply these directly to arm-soc/fixes.

Florian, thanks for the fixes.

Kevin

[PATCH 0/3] ARM: dts: Fixes for Overo/Tobi against 3.14-rc1

[Florian Vaussard]

Hi,

On 02/06/2014 06:09 PM, Kevin Hilman wrote:
> Florian Vaussard <florian.vaussard@epfl.ch> writes:
> 
>> OMAP36xx-based Overo (Storm and alike) are now failing to boot with 3.14-rc1 [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.
> 
> And I tested with my 35xx/Overo with omap3-overo-tobi.dts and my
> 37xx/Overo STORM with omap3-overo-storm-tobi.dts and they're both
> working.
> 
> Tested-by: Kevin Hilman <khilman@linaro.org>
> 
> Tony, with your ack, I can apply these directly to arm-soc/fixes.
> 
> Florian, thanks for the fixes.
> 

This issue is still present in 3.14-rc2.

Shall I send a v2, including the suggestion of Nishanth, against 3.14-rc2?

Regards,
Florian

[PATCH 0/3] ARM: dts: Fixes for Overo/Tobi against 3.14-rc1

[Kevin Hilman]

Florian Vaussard <florian.vaussard@epfl.ch> writes:

> Hi,
>
> On 02/06/2014 06:09 PM, Kevin Hilman wrote:
>> Florian Vaussard <florian.vaussard@epfl.ch> writes:
>> 
>>> OMAP36xx-based Overo (Storm and alike) are now failing to boot with 3.14-rc1 [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.
>> 
>> And I tested with my 35xx/Overo with omap3-overo-tobi.dts and my
>> 37xx/Overo STORM with omap3-overo-storm-tobi.dts and they're both
>> working.
>> 
>> Tested-by: Kevin Hilman <khilman@linaro.org>
>> 
>> Tony, with your ack, I can apply these directly to arm-soc/fixes.
>> 
>> Florian, thanks for the fixes.
>> 
>
> This issue is still present in 3.14-rc2.
>
> Shall I send a v2, including the suggestion of Nishanth, against 3.14-rc2?
>

Feel free to send a v2.  I was just waiting for Tony to queue them up
(or ack and I'll take them through arm-soc.)

Kevin