summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2014-02-09 14:12:35 +0200
committerTony Lindgren <tony@atomide.com>2014-02-13 15:21:36 -0800
commit2a074deffd66d5e1893e859dc0737887fea9d46d (patch)
tree04f84427beac518d9c76a96ca9184daf4a6dd71e /arch/arm
parent8c5cb1a8f81370f60c62450fa5a5cf20aa081050 (diff)
downloadop-kernel-dev-2a074deffd66d5e1893e859dc0737887fea9d46d.zip
op-kernel-dev-2a074deffd66d5e1893e859dc0737887fea9d46d.tar.gz
ARM: dts: N9/N950: fix boot hang with 3.14-rc1
N9/N950 does not boot anymore with 3.14-rc1, because SoC compatible property is missing. Fix that. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Nishanth Menon <nm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/omap3-n9.dts2
-rw-r--r--arch/arm/boot/dts/omap3-n950.dts2
2 files changed, 2 insertions, 2 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-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";
};
OpenPOWER on IntegriCloud