diff mbox

[1/1] ARM: dts: omap3-igep: fix boot fail due wrong compatible match

Message ID 1393077576-25730-1-git-send-email-javier.martinez@collabora.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Javier Martinez Canillas Feb. 22, 2014, 1:59 p.m. UTC
This patch is based on commit:

016c12d2 ("ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree")

and fixes a boot hang due the IGEP board being wrongly initialized
as an OMAP3430 platform instead of an OMAP3630.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---

Tony and Benoit,

Sorry for posting this patch this late on the -rc cycle but I just didn't
have time before to test IGEP boards against 3.14.

I hope this fix can still make it to 3.14 since is a very big issue
(board not even booting).

Thanks a lot and best regards,
Javier

 arch/arm/boot/dts/omap3-igep0020.dts | 2 +-
 arch/arm/boot/dts/omap3-igep0030.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Javier Martinez Canillas Feb. 28, 2014, 6:49 p.m. UTC | #1
Hi Tony,

On Sat, Feb 22, 2014 at 10:59 AM, Javier Martinez Canillas
<javier.martinez@collabora.co.uk> wrote:
> This patch is based on commit:
>
> 016c12d2 ("ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree")
>
> and fixes a boot hang due the IGEP board being wrongly initialized
> as an OMAP3430 platform instead of an OMAP3630.
>
> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> ---
>
> Tony and Benoit,
>
> Sorry for posting this patch this late on the -rc cycle but I just didn't
> have time before to test IGEP boards against 3.14.
>
> I hope this fix can still make it to 3.14 since is a very big issue
> (board not even booting).
>
> Thanks a lot and best regards,
> Javier
>
>  arch/arm/boot/dts/omap3-igep0020.dts | 2 +-
>  arch/arm/boot/dts/omap3-igep0030.dts | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts
> index 25a2b5f..f2779ac 100644
> --- a/arch/arm/boot/dts/omap3-igep0020.dts
> +++ b/arch/arm/boot/dts/omap3-igep0020.dts
> @@ -14,7 +14,7 @@
>
>  / {
>         model = "IGEPv2 (TI OMAP AM/DM37x)";
> -       compatible = "isee,omap3-igep0020", "ti,omap3";
> +       compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3";
>
>         leds {
>                 pinctrl-names = "default";
> diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts
> index 145c58c..2793749 100644
> --- a/arch/arm/boot/dts/omap3-igep0030.dts
> +++ b/arch/arm/boot/dts/omap3-igep0030.dts
> @@ -13,7 +13,7 @@
>
>  / {
>         model = "IGEP COM MODULE (TI OMAP AM/DM37x)";
> -       compatible = "isee,omap3-igep0030", "ti,omap3";
> +       compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3";
>
>         leds {
>                 pinctrl-names = "default";
> --
> 1.8.5.3
>

I saw you send a pull request for 3.14-rc4 fixes and this fix was not included.

Are you planning to send more fixes for 3.14?

Thanks a lot and best regards,
Javier
Tony Lindgren Feb. 28, 2014, 6:57 p.m. UTC | #2
* Javier Martinez Canillas <javier@dowhile0.org> [140228 10:52]:
> Hi Tony,
> 
> On Sat, Feb 22, 2014 at 10:59 AM, Javier Martinez Canillas
> <javier.martinez@collabora.co.uk> wrote:
> > This patch is based on commit:
> >
> > 016c12d2 ("ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree")
> >
> > and fixes a boot hang due the IGEP board being wrongly initialized
> > as an OMAP3430 platform instead of an OMAP3630.
> >
> > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> > ---
> >
> > Tony and Benoit,
> >
> > Sorry for posting this patch this late on the -rc cycle but I just didn't
> > have time before to test IGEP boards against 3.14.
> >
> > I hope this fix can still make it to 3.14 since is a very big issue
> > (board not even booting).
> >
> > Thanks a lot and best regards,
> > Javier
> >
> >  arch/arm/boot/dts/omap3-igep0020.dts | 2 +-
> >  arch/arm/boot/dts/omap3-igep0030.dts | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts
> > index 25a2b5f..f2779ac 100644
> > --- a/arch/arm/boot/dts/omap3-igep0020.dts
> > +++ b/arch/arm/boot/dts/omap3-igep0020.dts
> > @@ -14,7 +14,7 @@
> >
> >  / {
> >         model = "IGEPv2 (TI OMAP AM/DM37x)";
> > -       compatible = "isee,omap3-igep0020", "ti,omap3";
> > +       compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3";
> >
> >         leds {
> >                 pinctrl-names = "default";
> > diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts
> > index 145c58c..2793749 100644
> > --- a/arch/arm/boot/dts/omap3-igep0030.dts
> > +++ b/arch/arm/boot/dts/omap3-igep0030.dts
> > @@ -13,7 +13,7 @@
> >
> >  / {
> >         model = "IGEP COM MODULE (TI OMAP AM/DM37x)";
> > -       compatible = "isee,omap3-igep0030", "ti,omap3";
> > +       compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3";
> >
> >         leds {
> >                 pinctrl-names = "default";
> > --
> > 1.8.5.3
> >
> 
> I saw you send a pull request for 3.14-rc4 fixes and this fix was not included.
> 
> Are you planning to send more fixes for 3.14?

Yes hoping to send one more set, got this one tagged for it.

Regards,

Tony
Javier Martinez Canillas Feb. 28, 2014, 7:04 p.m. UTC | #3
Hi Tony,

On Fri, Feb 28, 2014 at 3:57 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Javier Martinez Canillas <javier@dowhile0.org> [140228 10:52]:
>> Hi Tony,
>>
>> On Sat, Feb 22, 2014 at 10:59 AM, Javier Martinez Canillas
>> <javier.martinez@collabora.co.uk> wrote:
>> > This patch is based on commit:
>> >
>> > 016c12d2 ("ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree")
>> >
>> > and fixes a boot hang due the IGEP board being wrongly initialized
>> > as an OMAP3430 platform instead of an OMAP3630.
>> >
>> > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>> > ---
>> >
>> > Tony and Benoit,
>> >
>> > Sorry for posting this patch this late on the -rc cycle but I just didn't
>> > have time before to test IGEP boards against 3.14.
>> >
>> > I hope this fix can still make it to 3.14 since is a very big issue
>> > (board not even booting).
>> >
>> > Thanks a lot and best regards,
>> > Javier
>> >
>> >  arch/arm/boot/dts/omap3-igep0020.dts | 2 +-
>> >  arch/arm/boot/dts/omap3-igep0030.dts | 2 +-
>> >  2 files changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts
>> > index 25a2b5f..f2779ac 100644
>> > --- a/arch/arm/boot/dts/omap3-igep0020.dts
>> > +++ b/arch/arm/boot/dts/omap3-igep0020.dts
>> > @@ -14,7 +14,7 @@
>> >
>> >  / {
>> >         model = "IGEPv2 (TI OMAP AM/DM37x)";
>> > -       compatible = "isee,omap3-igep0020", "ti,omap3";
>> > +       compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3";
>> >
>> >         leds {
>> >                 pinctrl-names = "default";
>> > diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts
>> > index 145c58c..2793749 100644
>> > --- a/arch/arm/boot/dts/omap3-igep0030.dts
>> > +++ b/arch/arm/boot/dts/omap3-igep0030.dts
>> > @@ -13,7 +13,7 @@
>> >
>> >  / {
>> >         model = "IGEP COM MODULE (TI OMAP AM/DM37x)";
>> > -       compatible = "isee,omap3-igep0030", "ti,omap3";
>> > +       compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3";
>> >
>> >         leds {
>> >                 pinctrl-names = "default";
>> > --
>> > 1.8.5.3
>> >
>>
>> I saw you send a pull request for 3.14-rc4 fixes and this fix was not included.
>>
>> Are you planning to send more fixes for 3.14?
>
> Yes hoping to send one more set, got this one tagged for it.
>

Great, thanks a lot for your help!

Best regards,
Javier
Tony Lindgren Feb. 28, 2014, 7:31 p.m. UTC | #4
* Javier Martinez Canillas <javier@dowhile0.org> [140228 11:07]:
> On Fri, Feb 28, 2014 at 3:57 PM, Tony Lindgren <tony@atomide.com> wrote:
> > * Javier Martinez Canillas <javier@dowhile0.org> [140228 10:52]:
> >>
> >> I saw you send a pull request for 3.14-rc4 fixes and this fix was not included.
> >>
> >> Are you planning to send more fixes for 3.14?
> >
> > Yes hoping to send one more set, got this one tagged for it.
> >
> 
> Great, thanks a lot for your help!

Applied to omap-for-v3.14/fixes and pushed out now thanks.

Tony
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts
index 25a2b5f..f2779ac 100644
--- a/arch/arm/boot/dts/omap3-igep0020.dts
+++ b/arch/arm/boot/dts/omap3-igep0020.dts
@@ -14,7 +14,7 @@ 
 
 / {
 	model = "IGEPv2 (TI OMAP AM/DM37x)";
-	compatible = "isee,omap3-igep0020", "ti,omap3";
+	compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3";
 
 	leds {
 		pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts
index 145c58c..2793749 100644
--- a/arch/arm/boot/dts/omap3-igep0030.dts
+++ b/arch/arm/boot/dts/omap3-igep0030.dts
@@ -13,7 +13,7 @@ 
 
 / {
 	model = "IGEP COM MODULE (TI OMAP AM/DM37x)";
-	compatible = "isee,omap3-igep0030", "ti,omap3";
+	compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3";
 
 	leds {
 		pinctrl-names = "default";