| Message ID | 1392287116-4548-2-git-send-email-florian.vaussard@epfl.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/13/2014 04:25 AM, Florian Vaussard wrote: > Tobi expansion board can be used with both OMAP35xx-based Overo, > and OMAP36xx-based Overo. Currently the boot is broken with newer > OMAP36xx-based Overo (Storm and alike). Fix include file and > compatible string to be able to boot newer models. > > This will break older models. This will be addressed later. > > Signed-off-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> > Tested-by: Kevin Hilman <khilman@linaro.org> Acked-by: Nishanth Menon <nm@ti.com> > --- > arch/arm/boot/dts/omap3-overo.dtsi | 3 --- > arch/arm/boot/dts/omap3-tobi.dts | 5 ++++- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi > index a461d2f..5970999 100644 > --- a/arch/arm/boot/dts/omap3-overo.dtsi > +++ b/arch/arm/boot/dts/omap3-overo.dtsi > @@ -9,9 +9,6 @@ > /* > * The Gumstix Overo must be combined with an expansion board. > */ > -/dts-v1/; > - > -#include "omap34xx.dtsi" > > / { > pwmleds { > diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts > index 7e4ad2a..0e3b8bf 100644 > --- a/arch/arm/boot/dts/omap3-tobi.dts > +++ b/arch/arm/boot/dts/omap3-tobi.dts > @@ -10,11 +10,14 @@ > * Tobi expansion board is manufactured by Gumstix Inc. > */ > > +/dts-v1/; > + > +#include "omap36xx.dtsi" > #include "omap3-overo.dtsi" > > / { > model = "TI OMAP3 Gumstix Overo on Tobi"; > - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"; > + compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap36xx", "ti,omap3"; > > leds { > compatible = "gpio-leds"; >
diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi index a461d2f..5970999 100644 --- a/arch/arm/boot/dts/omap3-overo.dtsi +++ b/arch/arm/boot/dts/omap3-overo.dtsi @@ -9,9 +9,6 @@ /* * The Gumstix Overo must be combined with an expansion board. */ -/dts-v1/; - -#include "omap34xx.dtsi" / { pwmleds { diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts index 7e4ad2a..0e3b8bf 100644 --- a/arch/arm/boot/dts/omap3-tobi.dts +++ b/arch/arm/boot/dts/omap3-tobi.dts @@ -10,11 +10,14 @@ * Tobi expansion board is manufactured by Gumstix Inc. */ +/dts-v1/; + +#include "omap36xx.dtsi" #include "omap3-overo.dtsi" / { model = "TI OMAP3 Gumstix Overo on Tobi"; - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"; + compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap36xx", "ti,omap3"; leds { compatible = "gpio-leds";