Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f03ef09b authored by Florian Vaussard's avatar Florian Vaussard Committed by Tony Lindgren
Browse files

ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi 



Unfortunatly the device tree for older OMAP35xx Overo cannot be used
with newer OMAP36xx and vice-versa. To address this issue, move most of
the Tobi DTS to a common include file, and create model-specific Tobi
DTS.

Signed-off-by: default avatarFlorian Vaussard <florian.vaussard@epfl.ch>
Tested-by: default avatarKevin Hilman <khilman@linaro.org>
Acked-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1ce64826

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-n900.dtb \

	omap3-n9.dtb \

	omap3-n950.dtb \

	omap3-tobi.dtb \

	omap3-overo-tobi.dtb \

	omap3-overo-storm-tobi.dtb \

	omap3-gta04.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

arch/arm/boot/dts/omap3-overo-storm-tobi.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/*

 * Tobi expansion board is manufactured by Gumstix Inc.

 */



/dts-v1/;



#include "omap36xx.dtsi"

#include "omap3-overo-tobi-common.dtsi"



/ {

	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Tobi";

	compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";

};

arch/arm/boot/dts/omap3-tobi.dts→arch/arm/boot/dts/omap3-overo-tobi-common.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -10,15 +10,9 @@ 
 * 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 = "gumstix,omap3-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";



	leds {

		compatible = "gpio-leds";

		heartbeat {

arch/arm/boot/dts/omap3-overo-tobi.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/*

 * Tobi expansion board is manufactured by Gumstix Inc.

 */



/dts-v1/;



#include "omap34xx.dtsi"

#include "omap3-overo-tobi-common.dtsi"



/ {

	model = "OMAP35xx Gumstix Overo on Tobi";

	compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3";

};