| Message ID | 1391677818-21154-4-git-send-email-florian.vaussard@epfl.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/06/2014 03:10 AM, Florian Vaussard wrote: > Unfortunatly the device tree for older OMAP35xx Overo cannot be used Unfortunately ? > 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. > [...] > diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts b/arch/arm/boot/dts/omap3-overo-tobi.dts > new file mode 100644 > index 0000000..2f82192 > --- /dev/null > +++ b/arch/arm/boot/dts/omap3-overo-tobi.dts > @@ -0,0 +1,22 @@ > +/* > + * 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,omap3"; To reduce any future problems, I suggest: compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"; > +}; > + >
On 02/06/2014 03:35 PM, Nishanth Menon wrote: > On 02/06/2014 03:10 AM, Florian Vaussard wrote: >> Unfortunatly the device tree for older OMAP35xx Overo cannot be used > Unfortunately ? Indeed >> 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. >> > [...] >> diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts b/arch/arm/boot/dts/omap3-overo-tobi.dts >> new file mode 100644 >> index 0000000..2f82192 >> --- /dev/null >> +++ b/arch/arm/boot/dts/omap3-overo-tobi.dts >> @@ -0,0 +1,22 @@ >> +/* >> + * 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,omap3"; > To reduce any future problems, I suggest: > compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", > "ti,omap3430", "ti,omap3"; > This was also my first thought, but "ti,omap3430" is not documented in Documentation/devicetree/bindings/arm/omap/omap.txt. It is said that "ti,omap3" defaults to OMAP3430. I do not know if omap35xx would be more accurate, as these Overo are using OMAP3503 and OMAP3530. Regards, Florian
On 02/06/2014 09:13 AM, Florian Vaussard wrote: [...] >>> +#include "omap34xx.dtsi" >>> +#include "omap3-overo-tobi-common.dtsi" >>> + >>> +/ { >>> + model = "OMAP35xx Gumstix Overo on Tobi"; >>> + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"; >> To reduce any future problems, I suggest: >> compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", >> "ti,omap3430", "ti,omap3"; >> > > This was also my first thought, but "ti,omap3430" is not documented in > Documentation/devicetree/bindings/arm/omap/omap.txt. It is said that > "ti,omap3" defaults to OMAP3430. I do not know if omap35xx would be more > accurate, as these Overo are using OMAP3503 and OMAP3530. 3430 should have been now documented with commit 89b6eef0d859bad4bcf7ad64560aa2891d6a37a0 http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/arm/omap/omap.txt#n64 We have not pulled out 3730 or 3530 separately out in linux as of today as they are nothing but a packaging difference for larger board community - there should be no internal differences - the only functional variation has been am3517 - which got it's own compatible property.
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b9d6a8b..e8355f4 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -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 \ diff --git a/arch/arm/boot/dts/omap3-overo-storm-tobi.dts b/arch/arm/boot/dts/omap3-overo-storm-tobi.dts new file mode 100644 index 0000000..966b5c9 --- /dev/null +++ b/arch/arm/boot/dts/omap3-overo-storm-tobi.dts @@ -0,0 +1,22 @@ +/* + * 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"; +}; + diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi similarity index 91% rename from arch/arm/boot/dts/omap3-tobi.dts rename to arch/arm/boot/dts/omap3-overo-tobi-common.dtsi index c742afa..4edc013 100644 --- a/arch/arm/boot/dts/omap3-tobi.dts +++ b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi @@ -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 { diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts b/arch/arm/boot/dts/omap3-overo-tobi.dts new file mode 100644 index 0000000..2f82192 --- /dev/null +++ b/arch/arm/boot/dts/omap3-overo-tobi.dts @@ -0,0 +1,22 @@ +/* + * 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,omap3"; +}; +
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: Florian Vaussard <florian.vaussard@epfl.ch> --- arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 22 ++++++++++++++++++++++ ...omap3-tobi.dts => omap3-overo-tobi-common.dtsi} | 6 ------ arch/arm/boot/dts/omap3-overo-tobi.dts | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobi.dts rename arch/arm/boot/dts/{omap3-tobi.dts => omap3-overo-tobi-common.dtsi} (91%) create mode 100644 arch/arm/boot/dts/omap3-overo-tobi.dts