ARM: dts: N9/N950: fix boot hang with 3.14-rc1
PATCH 1/2 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.
--- arch/arm/boot/dts/omap3-n9.dts | 2 +- arch/arm/boot/dts/omap3-n950.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap3-n9.dts +1 -1
@@ -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-n950.dts +1 -1
@@ -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.8.5.3
PATCH 2/2 ARM: dts: N900: add missing compatible property
Add missing compatible property to avoid problems in the future.
--- arch/arm/boot/dts/omap3-n900.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap3-n900.dts +2 -2
@@ -1,6 +1,6 @@ /* * Copyright (C) 2013 Pavel Machek <[email protected]> - * Copyright 2013 Aaro Koskinen <[email protected]> + * Copyright (C) 2013-2014 Aaro Koskinen <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 (or later) as
@@ -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 {
Signature · 1 line
1.8.5.3
PATCH 2/2 ARM: dts: N900: add missing compatible property
Quoted 3 lines · Aaro Koskinen
Add missing compatible property to avoid problems in the future.
Signed-off-by Aaro Koskinen <[email protected]>
Quoted 26 lines
--- arch/arm/boot/dts/omap3-n900.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/boot/dts/omap3-n900.dts +2
-2@@ -1,6 +1,6 @@ /* * Copyright (C) 2013 Pavel Machek <[email protected]> - * Copyright 2013 Aaro Koskinen <[email protected]> + * Copyright (C) 2013-2014 Aaro Koskinen <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 (or later) as@@ -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 {
Signature · 2 lines
Regards, Nishanth Menon
PATCH 1/2 ARM: dts: N9/N950: fix boot hang with 3.14-rc1
In reply to Aaro KoskinenQuoted 4 lines · Aaro Koskinen
N9/N950 does not boot anymore with 3.14-rc1, because SoC compatible property is missing. Fix that.
Signed-off-by Aaro Koskinen <[email protected]>
Quoted 28 lines
--- arch/arm/boot/dts/omap3-n9.dts | 2 +- arch/arm/boot/dts/omap3-n950.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)arch/arm/boot/dts/omap3-n9.dts +1
-1@@ -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-n950.dts +1
-1@@ -14,5 +14,5 @@ / { model = "Nokia N950"; - compatible = "nokia,omap3-n950", "ti,omap3"; + compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3"; };
Signature · 2 lines
Regards, Nishanth Menon
PATCH 1/2 ARM: dts: N9/N950: fix boot hang with 3.14-rc1
Quoted 7 lines · Nishanth Menon
Quoted 4 lines · Aaro Koskinen
N9/N950 does not boot anymore with 3.14-rc1, because SoC compatible property is missing. Fix that.
Signed-off-by Aaro Koskinen <[email protected]>Reviewed-by Nishanth Menon <[email protected]>
Applying both into omap-for-v3.14/fixes thanks.
Tony