* [PATCH] ARM: dts: omap3-n9 family: mark proper OMAP version
@ 2014-02-11 15:29 Nishanth Menon
2014-02-11 18:51 ` Aaro Koskinen
0 siblings, 1 reply; 3+ messages in thread
From: Nishanth Menon @ 2014-02-11 15:29 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren
Cc: linux-omap, devicetree, linux-arm-kernel, linux-kernel,
Nishanth Menon, Aaro Koskinen
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.
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
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(-)
diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
index 39828ce..9938b5d 100644
--- a/arch/arm/boot/dts/omap3-n9.dts
+++ b/arch/arm/boot/dts/omap3-n9.dts
@@ -14,5 +14,5 @@
/ {
model = "Nokia N9";
- compatible = "nokia,omap3-n9", "ti,omap3";
+ compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
};
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 6fc85f9..97db027 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -13,7 +13,7 @@
/ {
model = "Nokia N900";
- compatible = "nokia,omap3-n900", "ti,omap3";
+ compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
cpus {
cpu@0 {
diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
index b076a52..261c558 100644
--- a/arch/arm/boot/dts/omap3-n950.dts
+++ b/arch/arm/boot/dts/omap3-n950.dts
@@ -14,5 +14,5 @@
/ {
model = "Nokia N950";
- compatible = "nokia,omap3-n950", "ti,omap3";
+ compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: dts: omap3-n9 family: mark proper OMAP version
2014-02-11 15:29 [PATCH] ARM: dts: omap3-n9 family: mark proper OMAP version Nishanth Menon
@ 2014-02-11 18:51 ` Aaro Koskinen
2014-02-11 20:10 ` Nishanth Menon
0 siblings, 1 reply; 3+ messages in thread
From: Aaro Koskinen @ 2014-02-11 18:51 UTC (permalink / raw)
To: Nishanth Menon
Cc: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel, linux-kernel
Hi,
On Tue, Feb 11, 2014 at 09:29:01AM -0600, Nishanth Menon wrote:
> 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.
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
>
> 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(-)
>
> diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
> index 39828ce..9938b5d 100644
> --- a/arch/arm/boot/dts/omap3-n9.dts
> +++ b/arch/arm/boot/dts/omap3-n9.dts
> @@ -14,5 +14,5 @@
>
> / {
> model = "Nokia N9";
> - compatible = "nokia,omap3-n9", "ti,omap3";
> + compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
> };
> diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
> index 6fc85f9..97db027 100644
> --- a/arch/arm/boot/dts/omap3-n900.dts
> +++ b/arch/arm/boot/dts/omap3-n900.dts
> @@ -13,7 +13,7 @@
>
> / {
> model = "Nokia N900";
> - compatible = "nokia,omap3-n900", "ti,omap3";
> + compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
>
> cpus {
> cpu@0 {
> diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
> index b076a52..261c558 100644
> --- a/arch/arm/boot/dts/omap3-n950.dts
> +++ b/arch/arm/boot/dts/omap3-n950.dts
> @@ -14,5 +14,5 @@
>
> / {
> model = "Nokia N950";
> - compatible = "nokia,omap3-n950", "ti,omap3";
> + compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
> };
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: dts: omap3-n9 family: mark proper OMAP version
2014-02-11 18:51 ` Aaro Koskinen
@ 2014-02-11 20:10 ` Nishanth Menon
0 siblings, 0 replies; 3+ messages in thread
From: Nishanth Menon @ 2014-02-11 20:10 UTC (permalink / raw)
To: Aaro Koskinen
Cc: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
linux-arm-kernel, linux-kernel
Aaro,
On 02/11/2014 12:51 PM, Aaro Koskinen wrote:
> Hi,
>
> On Tue, Feb 11, 2014 at 09:29:01AM -0600, Nishanth Menon wrote:
>> 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.
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.
--
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-11 20:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-11 15:29 [PATCH] ARM: dts: omap3-n9 family: mark proper OMAP version Nishanth Menon
2014-02-11 18:51 ` Aaro Koskinen
2014-02-11 20:10 ` Nishanth Menon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).