This small patchset move omap3-gta04.dts to omap3-gta04.dtsi which then share
common parts with a3,a4 and a5 models. Models a3 and a5 have only small additions
to gta04a4 model.
Marek Belisko (3):
arm: dts: omap3-gta04: Rename gta04.dts to gta04.dtsi and add a4 model
arm: dts: Add gta04a3 model
arm: dts: Add gta04a5 model
arch/arm/boot/dts/Makefile | 4 +-
.../boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} | 0
arch/arm/boot/dts/omap3-gta04a3.dts | 48 ++++++++++++++++++++++
arch/arm/boot/dts/omap3-gta04a4.dts | 13 ++++++
arch/arm/boot/dts/omap3-gta04a5.dts | 17 ++++++++
5 files changed, 81 insertions(+), 1 deletion(-)
rename arch/arm/boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} (100%)
create mode 100644 arch/arm/boot/dts/omap3-gta04a3.dts
create mode 100644 arch/arm/boot/dts/omap3-gta04a4.dts
create mode 100644 arch/arm/boot/dts/omap3-gta04a5.dts
--
1.9.1
-
This patch is preparation of adding more boards which have common moved
to omap3-gta04.dtsi. Other boards have only small additions to omap3-gta04a4.
Signed-off-by: Marek Belisko <[email protected]>
---
arch/arm/boot/dts/Makefile | 2 +-
arch/arm/boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} | 0
arch/arm/boot/dts/omap3-gta04a4.dts | 13 +++++++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
rename arch/arm/boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} (100%)
create mode 100644 arch/arm/boot/dts/omap3-gta04a4.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 82f498b..3dc9d44 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -283,7 +283,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
omap3-devkit8000.dtb \
omap3-evm.dtb \
omap3-evm-37xx.dtb \
- omap3-gta04.dtb \
+ omap3-gta04a4.dtb \
omap3-igep0020.dtb \
omap3-igep0030.dtb \
omap3-ldp.dtb \
diff --git a/arch/arm/boot/dts/omap3-gta04.dts b/arch/arm/boot/dts/omap3-gta04.dtsi
similarity index 100%
rename from arch/arm/boot/dts/omap3-gta04.dts
rename to arch/arm/boot/dts/omap3-gta04.dtsi
diff --git a/arch/arm/boot/dts/omap3-gta04a4.dts b/arch/arm/boot/dts/omap3-gta04a4.dts
new file mode 100644
index 0000000..c918bb1
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-gta04a4.dts
@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2014 Marek Belisko <[email protected]>
+ *
+ * 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.
+ */
+
+#include "omap3-gta04.dtsi"
+
+/ {
+ model = "Goldelico GTA04A4";
+};
--
1.9.1
Add model a5 which have additional jack detection.
Signed-off-by: Marek Belisko <[email protected]>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/omap3-gta04a5.dts | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 arch/arm/boot/dts/omap3-gta04a5.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7d45fde..576c595 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -285,6 +285,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
omap3-evm-37xx.dtb \
omap3-gta04a3.dtb \
omap3-gta04a4.dtb \
+ omap3-gta04a5.dtb \
omap3-igep0020.dtb \
omap3-igep0030.dtb \
omap3-ldp.dtb \
diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts b/arch/arm/boot/dts/omap3-gta04a5.dts
new file mode 100644
index 0000000..210317c3
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-gta04a5.dts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2014 H. Nikolaus Schaller <[email protected]>
+ *
+ * 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.
+ */
+
+#include "omap3-gta04.dtsi"
+
+/ {
+ model = "Goldelico GTA04A5;
+
+ sound {
+ ti,jack-det-gpio = <&twl_gpio 2 0>; /* GTA04A5 only */
+ };
+};
--
1.9.1
Add gta04a3 model with additional acceleromer.
Signed-off-by: Marek Belisko <[email protected]>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/omap3-gta04a3.dts | 48 +++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
create mode 100644 arch/arm/boot/dts/omap3-gta04a3.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 3dc9d44..7d45fde 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -283,6 +283,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
omap3-devkit8000.dtb \
omap3-evm.dtb \
omap3-evm-37xx.dtb \
+ omap3-gta04a3.dtb \
omap3-gta04a4.dtb \
omap3-igep0020.dtb \
omap3-igep0030.dtb \
diff --git a/arch/arm/boot/dts/omap3-gta04a3.dts b/arch/arm/boot/dts/omap3-gta04a3.dts
new file mode 100644
index 0000000..3099a89
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-gta04a3.dts
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2014 H. Nikolaus Schaller <[email protected]>
+ *
+ * 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.
+ */
+
+#include "omap3-gta04.dtsi"
+
+/ {
+ model = "Goldelico GTA04A3";
+};
+
+&i2c2 {
+
+ /* alternate accelerometer that might be installed on some GTA04A3 boards */
+ lis302@1d {
+ compatible = "st,lis331dlh", "st,lis3lv02d";
+ reg = <0x1d>;
+ interrupt-parent = <&gpio3>;
+ interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;
+ Vdd-supply = <&vaux2>;
+ Vdd_IO-supply = <&vaux2>;
+
+ st,click-single-x;
+ st,click-single-y;
+ st,click-single-z;
+ st,click-thresh-x = <8>;
+ st,click-thresh-y = <8>;
+ st,click-thresh-z = <10>;
+ st,click-click-time-limit = <9>;
+ st,click-latency = <50>;
+ st,irq1-click;
+ st,wakeup-x-lo;
+ st,wakeup-x-hi;
+ st,wakeup-y-lo;
+ st,wakeup-y-hi;
+ st,wakeup-z-lo;
+ st,wakeup-z-hi;
+ st,min-limit-x = <32>;
+ st,min-limit-y = <3>;
+ st,min-limit-z = <3>;
+ st,max-limit-x = <3>;
+ st,max-limit-y = <32>;
+ st,max-limit-z = <32>;
+ };
+};
--
1.9.1
Hi Michael,
On Mon, Jul 28, 2014 at 9:56 PM, Michael Trimarchi
<[email protected]> wrote:
> Hi Marek
>
> Il 28/lug/2014 21:54 "Marek Belisko" <[email protected]> ha scritto:
>
>
>>
>> Add model a5 which have additional jack detection.
>>
>> Signed-off-by: Marek Belisko <[email protected]>
>> ---
>> arch/arm/boot/dts/Makefile | 1 +
>> arch/arm/boot/dts/omap3-gta04a5.dts | 17 +++++++++++++++++
>> 2 files changed, 18 insertions(+)
>> create mode 100644 arch/arm/boot/dts/omap3-gta04a5.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 7d45fde..576c595 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -285,6 +285,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
>> omap3-evm-37xx.dtb \
>> omap3-gta04a3.dtb \
>> omap3-gta04a4.dtb \
>> + omap3-gta04a5.dtb \
>> omap3-igep0020.dtb \
>> omap3-igep0030.dtb \
>> omap3-ldp.dtb \
>> diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts
>> b/arch/arm/boot/dts/omap3-gta04a5.dts
>> new file mode 100644
>> index 0000000..210317c3
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/omap3-gta04a5.dts
>> @@ -0,0 +1,17 @@
>> +/*
>> + * Copyright (C) 2014 H. Nikolaus Schaller <[email protected]>
>> + *
>> + * 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.
>> + */
>> +
>> +#include "omap3-gta04.dtsi"
>> +
>> +/ {
>> + model = "Goldelico GTA04A5;
>> +
>> + sound {
>> + ti,jack-det-gpio = <&twl_gpio 2 0>; /* GTA04A5 only */
>> + };
>> +};
>> --
>> 1.9.1
>>
>
> Can we have only one dts with status enabled/disabled?
Do you mean to define this node it gta04.dtsi disabled and enable only
for a5 model?
>
> Michael
>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
BR,
marek
--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer
Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com
On Mon, Jul 28, 2014 at 10:04 PM, Michael Trimarchi
<[email protected]> wrote:
> Hi
>
> Il 28/lug/2014 22:02 "Belisko Marek" <[email protected]> ha scritto:
>
>
>>
>> Hi Michael,
>>
>> On Mon, Jul 28, 2014 at 9:56 PM, Michael Trimarchi
>> <[email protected]> wrote:
>> > Hi Marek
>> >
>> > Il 28/lug/2014 21:54 "Marek Belisko" <[email protected]> ha scritto:
>> >
>> >
>> >>
>> >> Add model a5 which have additional jack detection.
>> >>
>> >> Signed-off-by: Marek Belisko <[email protected]>
>> >> ---
>> >> arch/arm/boot/dts/Makefile | 1 +
>> >> arch/arm/boot/dts/omap3-gta04a5.dts | 17 +++++++++++++++++
>> >> 2 files changed, 18 insertions(+)
>> >> create mode 100644 arch/arm/boot/dts/omap3-gta04a5.dts
>> >>
>> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> >> index 7d45fde..576c595 100644
>> >> --- a/arch/arm/boot/dts/Makefile
>> >> +++ b/arch/arm/boot/dts/Makefile
>> >> @@ -285,6 +285,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
>> >> omap3-evm-37xx.dtb \
>> >> omap3-gta04a3.dtb \
>> >> omap3-gta04a4.dtb \
>> >> + omap3-gta04a5.dtb \
>> >> omap3-igep0020.dtb \
>> >> omap3-igep0030.dtb \
>> >> omap3-ldp.dtb \
>> >> diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts
>> >> b/arch/arm/boot/dts/omap3-gta04a5.dts
>> >> new file mode 100644
>> >> index 0000000..210317c3
>> >> --- /dev/null
>> >> +++ b/arch/arm/boot/dts/omap3-gta04a5.dts
>> >> @@ -0,0 +1,17 @@
>> >> +/*
>> >> + * Copyright (C) 2014 H. Nikolaus Schaller <[email protected]>
>> >> + *
>> >> + * 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.
>> >> + */
>> >> +
>> >> +#include "omap3-gta04.dtsi"
>> >> +
>> >> +/ {
>> >> + model = "Goldelico GTA04A5;
>> >> +
>> >> + sound {
>> >> + ti,jack-det-gpio = <&twl_gpio 2 0>; /* GTA04A5 only
>> >> */
>> >> + };
>> >> +};
>> >> --
>> >> 1.9.1
>> >>
>> >
>> > Can we have only one dts with status enabled/disabled?
>> Do you mean to define this node it gta04.dtsi disabled and enable only
>> for a5 model?
>> >
>
> This should be possible in the bootloader
Sorry I didn't get that. Can you give me some short example (or
existing board which using it)?
Thanks.
>
> Right?
>
> Michael
>
>> > Michael
>> >
>> >> --
>> >> To unsubscribe from this list: send the line "unsubscribe linux-omap"
>> >> in
>> >> the body of a message to [email protected]
>> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>> BR,
>>
>> marek
>>
>> --
>> as simple and primitive as possible
>> -------------------------------------------------
>> Marek Belisko - OPEN-NANDRA
>> Freelance Developer
>>
>> Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
>> Tel: +421 915 052 184
>> skype: marekwhite
>> twitter: #opennandra
>> web: http://open-nandra.com
BR,
marek
--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer
Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com
Hi,
Am 28.07.2014 um 22:12 schrieb Michael Trimarchi:
> Hi
>
> Il 28/lug/2014 22:06 "Belisko Marek" <[email protected]> ha scritto:
> >
> > On Mon, Jul 28, 2014 at 10:04 PM, Michael Trimarchi
> > <[email protected]> wrote:
> > > Hi
> > >
> > > Il 28/lug/2014 22:02 "Belisko Marek" <[email protected]> ha scritto:
> > >
> > >
> > >>
> > >> Hi Michael,
> > >>
> > >> On Mon, Jul 28, 2014 at 9:56 PM, Michael Trimarchi
> > >> <[email protected]> wrote:
> > >> > Hi Marek
> > >> >
> > >> > Il 28/lug/2014 21:54 "Marek Belisko" <[email protected]> ha scritto:
> > >> >
> > >> >
> > >> >>
> > >> >> Add model a5 which have additional jack detection.
> > >> >>
> > >> >> Signed-off-by: Marek Belisko <[email protected]>
> > >> >> ---
> > >> >> arch/arm/boot/dts/Makefile | 1 +
> > >> >> arch/arm/boot/dts/omap3-gta04a5.dts | 17 +++++++++++++++++
> > >> >> 2 files changed, 18 insertions(+)
> > >> >> create mode 100644 arch/arm/boot/dts/omap3-gta04a5.dts
> > >> >>
> > >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > >> >> index 7d45fde..576c595 100644
> > >> >> --- a/arch/arm/boot/dts/Makefile
> > >> >> +++ b/arch/arm/boot/dts/Makefile
> > >> >> @@ -285,6 +285,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
> > >> >> omap3-evm-37xx.dtb \
> > >> >> omap3-gta04a3.dtb \
> > >> >> omap3-gta04a4.dtb \
> > >> >> + omap3-gta04a5.dtb \
> > >> >> omap3-igep0020.dtb \
> > >> >> omap3-igep0030.dtb \
> > >> >> omap3-ldp.dtb \
> > >> >> diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts
> > >> >> b/arch/arm/boot/dts/omap3-gta04a5.dts
> > >> >> new file mode 100644
> > >> >> index 0000000..210317c3
> > >> >> --- /dev/null
> > >> >> +++ b/arch/arm/boot/dts/omap3-gta04a5.dts
> > >> >> @@ -0,0 +1,17 @@
> > >> >> +/*
> > >> >> + * Copyright (C) 2014 H. Nikolaus Schaller <[email protected]>
> > >> >> + *
> > >> >> + * 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.
> > >> >> + */
> > >> >> +
> > >> >> +#include "omap3-gta04.dtsi"
> > >> >> +
> > >> >> +/ {
> > >> >> + model = "Goldelico GTA04A5;
> > >> >> +
> > >> >> + sound {
> > >> >> + ti,jack-det-gpio = <&twl_gpio 2 0>; /* GTA04A5 only
> > >> >> */
> > >> >> + };
> > >> >> +};
> > >> >> --
> > >> >> 1.9.1
> > >> >>
> > >> >
> > >> > Can we have only one dts with status enabled/disabled?
> > >> Do you mean to define this node it gta04.dtsi disabled and enable only
> > >> for a5 model?
> > >> >
> > >
> > > This should be possible in the bootloader
> > Sorry I didn't get that. Can you give me some short example (or
> > existing board which using it)?
> > Thanks.
> > >
>
> http://www.denx.de/wiki/view/DULG/UBootCmdFDT
>
> I just suggest to not create a dts for each board revision but let it manage by the bootloader. I don't know if there are examples but make sense to me to avoid to add a lot of dts.
>
>
Hm. Why should we dynamically modify the dtb in memory through slow, interpreted FDT commands in u-boot, if the DTC can statically compile complete .dtb files by using an #include mechanism? It would slow down boot time for no other improvement. And debugging is more difficult that looking for compiler errors.
And our u-boot does not support the fdt command to avoid bloating it. IMHO boot loaders should be as small and fast as possible and contain only what is barely necessary. Everything more sophisticated should be done by the kernel and device drivers and some init user space process. I.e. boot loader should only tell the kernel only which board revision it is but not "manage" the board revisions.
We also have a nice feature that a system on an SD card has the uImage in /boot and all existing and relevant .dtb files. U-Boot simply picks and loads the right one (by file name). This keeps the boot loader stable (people always have difficulties flashing new boot loaders). Therefore we need precompiled DTBs that completely and consistently describe each board variant. This mechanism allows that we can easily swap the SD card between different boards and variants. Implementing this feature using U-Boot scripts with FDT commands to patch the DT, appears to become a nightmare. If you are interested, the whole concept is described here:
http://projects.goldelico.com/p/gta04-main/downloads/55/
Another aspect to consider: in my understanding, the main reason why DT is still maintained within the kernel is that the bindings are not yet stable. Therefore if bindings are patched, all device trees using them are also to be changed. I don't see how this can work if we have part of the board variations managed outside the kernel tree. Therefore each board revision is to be treated not differently from a completely new board. And similar parts are treated by a common .dtsi. This is how the concept IMHO should be. And the consequence is that we need a different .dts file for each board that has differences (even if they are or appear to be small).
So I don't see that your suggestion is the right way to go.
BR,
Nikolaus
* Dr. H. Nikolaus Schaller <[email protected]> [140728 13:45]:
>
> Yes,
> the boot loader either loads gta04a3.dtb gta04.dtb or gta05.dtb
> depending on board revision.
>
> Therefore we have multiple device tree files to represent such hardware
> differences. Like Gumstix Overo variants (using a omap3-overo-base.dtsi)
>
> And, this difference is not the only one. Other are to come later.
>
> Unfortunately we were recommend to submit only DT nodes that already
> have drivers. Therefore, the "big picture" of the device variants support
> may not yet be visible from this patch.
>
> I hope this gives a little background.
So what's the conclusion? Are changes needed to this patch
series or not?
Regards,
Tony
Hi,
Am 29.07.2014 um 14:41 schrieb Tony Lindgren:
> * Dr. H. Nikolaus Schaller <[email protected]> [140728 13:45]:
>>
>> Yes,
>> the boot loader either loads gta04a3.dtb gta04.dtb or gta05.dtb
>> depending on board revision.
>>
>> Therefore we have multiple device tree files to represent such hardware
>> differences. Like Gumstix Overo variants (using a omap3-overo-base.dtsi)
>>
>> And, this difference is not the only one. Other are to come later.
>>
>> Unfortunately we were recommend to submit only DT nodes that already
>> have drivers. Therefore, the "big picture" of the device variants support
>> may not yet be visible from this patch.
>>
>> I hope this gives a little background.
>
> So what's the conclusion? Are changes needed to this patch
> series or not?
I advocate that no changes are needed.
BR,
Nikolaus
Hello,
On Tue, Jul 29, 2014 at 3:03 PM, Dr. H. Nikolaus Schaller
<[email protected]> wrote:
> Hi,
>> So what's the conclusion? Are changes needed to this patch
>> series or not?
>
> I advocate that no changes are needed.
>
I agree with Dr. H. Nikolaus on this regard. A DeviceTree should be a
description of the hardware and if two hardware platforms differs,
then we need two different DTS.
Lately I'm seeing some attempts to abuse u-boot's fdt command, u-boot
should only modify the strictly necessary like the /chosen branch.
Allowing u-boot to mangle the FDT before passing to the kernel just to
avoid some DT duplication doesn't sound like a good idea IMHO.
> BR,
> Nikolaus
>
> --
Best regards,
Javier