| Message ID | 1394533324-20299-1-git-send-email-lee.jones@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Lee, On 03/11/2014 11:22 AM, Lee Jones wrote: > From: Srinivas Kandagatla <srinivas.kandagatla@st.com> > > This patch adds support to rev E board of B2020 which has few minor > changes : > PHY reset PIO (Change from PIO30 to PIO07) > Power LED(Green) Control(Change from PIO47 to PIO13) I thought we decided last October to support only one revision of the b2020 board. The idea was to create an external git to provide DTS for all our boards, and only have a minimal subset in in the kernel. Regards, Maxime > > Acked-by: Lee Jones <lee.jones@linaro.org> > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com> > --- > arch/arm/boot/dts/Makefile | 3 ++- > arch/arm/boot/dts/stih416-b2020-revE.dts | 36 ++++++++++++++++++++++++++++++++ > 2 files changed, 38 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/boot/dts/stih416-b2020-revE.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 0320303..325218a 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -278,7 +278,8 @@ dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb > dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \ > stih416-b2000.dtb \ > stih415-b2020.dtb \ > - stih416-b2020.dtb > + stih416-b2020.dtb \ > + stih416-b2020-revE.dtb > dtb-$(CONFIG_ARCH_SUNXI) += \ > sun4i-a10-a1000.dtb \ > sun4i-a10-cubieboard.dtb \ > diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts > new file mode 100644 > index 0000000..bcb9d00 > --- /dev/null > +++ b/arch/arm/boot/dts/stih416-b2020-revE.dts > @@ -0,0 +1,36 @@ > +/* > + * Copyright (C) 2013 STMicroelectronics (R&D) Limited. > + * Author: Srinivas Kandagatla <srinivas.kandagatla@st.com> > + * > + * 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 > + * publishhed by the Free Software Foundation. > + */ > +/dts-v1/; > +#include "stih416.dtsi" > +#include "stih41x-b2020.dtsi" > +/ { > + model = "STih416 B2020 REV. E"; > + compatible = "st,stih416", "st,stih416-b2020"; > + > + soc { > + > + leds { > + compatible = "gpio-leds"; > + red { > + #gpio-cells = <1>; > + label = "Front Panel LED"; > + gpios = <&PIO4 1>; > + linux,default-trigger = "heartbeat"; > + }; > + green { > + gpios = <&PIO1 3>; > + default-state = "off"; > + }; > + }; > + > + ethernet1: ethernet@fef08000 { > + snps,reset-gpio = <&PIO0 7>; > + }; > + }; > +}; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
> >From: Srinivas Kandagatla <srinivas.kandagatla@st.com> > > > >This patch adds support to rev E board of B2020 which has few minor > >changes : > > PHY reset PIO (Change from PIO30 to PIO07) > > Power LED(Green) Control(Change from PIO47 to PIO13) > > I thought we decided last October to support only one revision of > the b2020 board. > > The idea was to create an external git to provide DTS for all our > boards, and only have a minimal subset in in the kernel. Ah, I was unaware of that conversation/decision. If that's the case we can scrap this submission along with the following patch. JOOI, what happens if I want to boot Mainline on my revE board? It won't be fully functional will it? That will be a shame. The LEDs, not so much, but networking is a pretty big piece of functionality to lose.
On 03/11/2014 12:23 PM, Lee Jones wrote: >>> From: Srinivas Kandagatla <srinivas.kandagatla@st.com> >>> >>> This patch adds support to rev E board of B2020 which has few minor >>> changes : >>> PHY reset PIO (Change from PIO30 to PIO07) >>> Power LED(Green) Control(Change from PIO47 to PIO13) >> >> I thought we decided last October to support only one revision of >> the b2020 board. >> >> The idea was to create an external git to provide DTS for all our >> boards, and only have a minimal subset in in the kernel. > > Ah, I was unaware of that conversation/decision. If that's the case we > can scrap this submission along with the following patch. In fact we had the discussion together with Arnd (IIRC) on #armlinux :) The reason is we wanted to avoid flooding arch/arm/dts/ with all the possible combinations of board revisions. The idea was to put in place a git repository at stlinux.com to provide the DTS for all the STi boards, and try to keep arch/arm/dts/sti* simple. > > JOOI, what happens if I want to boot Mainline on my revE board? It > won't be fully functional will it? That will be a shame. The LEDs, not > so much, but networking is a pretty big piece of functionality to > lose. I agree this is not comfortable. The problem is that your patch is not enough. We would need to create much more files, because for example, the i2c used are not the same between rev. C and rev. E. It gives theses files only for b2020 support: arch/arm/boot/dts/stih415-b2020.dts arch/arm/boot/dts/stih416-b2020e.dts arch/arm/boot/dts/stih41x-b2020e.dtsi arch/arm/boot/dts/stih416-b2020.dts arch/arm/boot/dts/stih41x-b2020.dtsi arch/arm/boot/dts/stih41x-b2020x.dtsi Regards, Maxime -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
> >>>From: Srinivas Kandagatla <srinivas.kandagatla@st.com> > >>> > >>>This patch adds support to rev E board of B2020 which has few minor > >>>changes : > >>> PHY reset PIO (Change from PIO30 to PIO07) > >>> Power LED(Green) Control(Change from PIO47 to PIO13) > >> > >>I thought we decided last October to support only one revision of > >>the b2020 board. > >> > >>The idea was to create an external git to provide DTS for all our > >>boards, and only have a minimal subset in in the kernel. > > > >Ah, I was unaware of that conversation/decision. If that's the case we > >can scrap this submission along with the following patch. > > In fact we had the discussion together with Arnd (IIRC) on #armlinux :) I remember discussing {cpu,machine}_is() implementations with regards to handling quirks. I wasn't aware that this culminated in the decision above. When it comes to things like PIO line or other key hardware changes through revisions, I fully expect this to be described inside a .dts file. > The reason is we wanted to avoid flooding arch/arm/dts/ with all the > possible combinations of board revisions. > > The idea was to put in place a git repository at stlinux.com to > provide the DTS for all the STi boards, and try to keep > arch/arm/dts/sti* simple. I can certainly sympathise with the reasoning, but for me fetching DTS files from an external Git repo sounds unnecessarily tiresome. I had thought about creating some per-vendor directories in there to simplify the format a little, but then I guess we're back to square one of the old arch/arm/mach-* situation. > >JOOI, what happens if I want to boot Mainline on my revE board? It > >won't be fully functional will it? That will be a shame. The LEDs, not > >so much, but networking is a pretty big piece of functionality to > >lose. > > I agree this is not comfortable. > > The problem is that your patch is not enough. We would need to > create much more files, because for example, the i2c used are not > the same between rev. C and rev. E. > > It gives theses files only for b2020 support: > arch/arm/boot/dts/stih415-b2020.dts > arch/arm/boot/dts/stih416-b2020e.dts > arch/arm/boot/dts/stih41x-b2020e.dtsi > arch/arm/boot/dts/stih416-b2020.dts > arch/arm/boot/dts/stih41x-b2020.dtsi > arch/arm/boot/dts/stih41x-b2020x.dtsi Right, but you're also talking about supporting two different SoCs there too, so I guess that's not so bad?
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 0320303..325218a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -278,7 +278,8 @@ dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \ stih416-b2000.dtb \ stih415-b2020.dtb \ - stih416-b2020.dtb + stih416-b2020.dtb \ + stih416-b2020-revE.dtb dtb-$(CONFIG_ARCH_SUNXI) += \ sun4i-a10-a1000.dtb \ sun4i-a10-cubieboard.dtb \ diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts new file mode 100644 index 0000000..bcb9d00 --- /dev/null +++ b/arch/arm/boot/dts/stih416-b2020-revE.dts @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2013 STMicroelectronics (R&D) Limited. + * Author: Srinivas Kandagatla <srinivas.kandagatla@st.com> + * + * 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 + * publishhed by the Free Software Foundation. + */ +/dts-v1/; +#include "stih416.dtsi" +#include "stih41x-b2020.dtsi" +/ { + model = "STih416 B2020 REV. E"; + compatible = "st,stih416", "st,stih416-b2020"; + + soc { + + leds { + compatible = "gpio-leds"; + red { + #gpio-cells = <1>; + label = "Front Panel LED"; + gpios = <&PIO4 1>; + linux,default-trigger = "heartbeat"; + }; + green { + gpios = <&PIO1 3>; + default-state = "off"; + }; + }; + + ethernet1: ethernet@fef08000 { + snps,reset-gpio = <&PIO0 7>; + }; + }; +};