diff mbox

[1/2] ARM: dts: N9/N950: fix boot hang with 3.14-rc1

Message ID 1391947956-24462-1-git-send-email-aaro.koskinen@iki.fi (mailing list archive)
State New, archived
Headers show

Commit Message

Aaro Koskinen Feb. 9, 2014, 12:12 p.m. UTC
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>
---
 arch/arm/boot/dts/omap3-n9.dts   | 2 +-
 arch/arm/boot/dts/omap3-n950.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Nishanth Menon Feb. 11, 2014, 8:11 p.m. UTC | #1
On 02/09/2014 06:12 AM, Aaro Koskinen wrote:
> 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>
> ---
>  arch/arm/boot/dts/omap3-n9.dts   | 2 +-
>  arch/arm/boot/dts/omap3-n950.dts | 2 +-
>  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 39828ce464ee..9938b5dc1909 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 b076a526b999..261c5589bfa3 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";
>  };
>
Tony Lindgren Feb. 13, 2014, 11:22 p.m. UTC | #2
* Nishanth Menon <nm@ti.com> [140211 12:13]:
> On 02/09/2014 06:12 AM, Aaro Koskinen wrote:
> > 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>

Applying both into omap-for-v3.14/fixes thanks.

Tony
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
index 39828ce464ee..9938b5dc1909 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 b076a526b999..261c5589bfa3 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";
 };