diff options
| author | Florian Vaussard <florian.vaussard@epfl.ch> | 2014-02-13 11:25:13 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-02-13 15:31:43 -0800 |
| commit | df1a29f4768a3de4ea793ff0b4c6e79ffa15849d (patch) | |
| tree | 5acd3b2a8903b2f0356abd6c30cdb7b79f5075f7 | |
| parent | 43e21ef061598024dcb4821b97b9eaebfed0b50d (diff) | |
| download | talos-obmc-linux-df1a29f4768a3de4ea793ff0b4c6e79ffa15849d.tar.gz talos-obmc-linux-df1a29f4768a3de4ea793ff0b4c6e79ffa15849d.zip | |
ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
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: Florian Vaussard <florian.vaussard@epfl.ch>
Tested-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/boot/dts/omap3-overo.dtsi | 3 | ||||
| -rw-r--r-- | 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 a461d2fd1fb0..597099907f8e 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 7e4ad2aec37a..0e3b8bf49761 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"; |
