| Message ID | 1442577980-26373-4-git-send-email-maxime.ripard@free-electrons.com |
|---|---|
| State | Superseded |
| Delegated to: | Hans de Goede |
| Headers | show |
On Fri, Sep 18, 2015 at 02:06:17PM +0200, Maxime Ripard wrote: > The R8 is very close to the A13, but it still has a few differences, > notably a composite output, which the A13 lacks. > > Add a DTSI based on the A13's to hold those differences. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Other than needing to use SPDX tags instead: Reviewed-by: Tom Rini <trini@konsulko.com>
On Fri, 2015-09-18 at 14:06 +0200, Maxime Ripard wrote: > The R8 is very close to the A13, but it still has a few differences, > notably a composite output, which the A13 lacks. > > Add a DTSI based on the A13's to hold those differences. Is this a direct import of one from the Linux tree? > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/dts/sun5i-r8.dtsi | 61 > ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 61 insertions(+) > create mode 100644 arch/arm/dts/sun5i-r8.dtsi > > diff --git a/arch/arm/dts/sun5i-r8.dtsi b/arch/arm/dts/sun5i-r8.dtsi > new file mode 100644 > index 000000000000..c9ed854687ca > --- /dev/null > +++ b/arch/arm/dts/sun5i-r8.dtsi > @@ -0,0 +1,61 @@ > +/* > + * Copyright 2015 Free Electrons > + * Copyright 2015 NextThing Co > + * > + * Maxime Ripard <maxime.ripard@free-electrons.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > the > + * License, or (at your option) any later version. > + * > + * This file is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +#include "skeleton.dtsi" > + > +#include "sun5i-a13.dtsi" > + > +/ { > + chosen { > + framebuffer@1 { > + compatible = "allwinner,simple-framebuffer", > + "simple-framebuffer"; > + allwinner,pipeline = "de_be0-lcd0-tve0"; > + clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates > 36>, > + <&ahb_gates 44>; > + status = "disabled"; > + }; > + }; > +};
Hi, On 09/18/2015 11:02 AM, Tom Rini wrote: > On Fri, Sep 18, 2015 at 02:06:17PM +0200, Maxime Ripard wrote: > >> The R8 is very close to the A13, but it still has a few differences, >> notably a composite output, which the A13 lacks. >> >> Add a DTSI based on the A13's to hold those differences. >> >> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Other than needing to use SPDX tags instead: > Reviewed-by: Tom Rini <trini@konsulko.com> This is in essence a partial sync with the kernel tree wrt the dts files, so no SPDX tags. Regards, Hans
On Fri, Sep 18, 2015 at 11:17:00AM -0400, Hans de Goede wrote: > Hi, > > On 09/18/2015 11:02 AM, Tom Rini wrote: > >On Fri, Sep 18, 2015 at 02:06:17PM +0200, Maxime Ripard wrote: > > > >>The R8 is very close to the A13, but it still has a few differences, > >>notably a composite output, which the A13 lacks. > >> > >>Add a DTSI based on the A13's to hold those differences. > >> > >>Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > > >Other than needing to use SPDX tags instead: > >Reviewed-by: Tom Rini <trini@konsulko.com> > > This is in essence a partial sync with the kernel tree wrt the dts > files, so no SPDX tags. Really? I'd have sworn that we were doing that even on kernel files, but it's not a huge deal if we aren't I suppose..
Hi, On 09/18/2015 11:39 AM, Tom Rini wrote: > On Fri, Sep 18, 2015 at 11:17:00AM -0400, Hans de Goede wrote: >> Hi, >> >> On 09/18/2015 11:02 AM, Tom Rini wrote: >>> On Fri, Sep 18, 2015 at 02:06:17PM +0200, Maxime Ripard wrote: >>> >>>> The R8 is very close to the A13, but it still has a few differences, >>>> notably a composite output, which the A13 lacks. >>>> >>>> Add a DTSI based on the A13's to hold those differences. >>>> >>>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >>> >>> Other than needing to use SPDX tags instead: >>> Reviewed-by: Tom Rini <trini@konsulko.com> >> >> This is in essence a partial sync with the kernel tree wrt the dts >> files, so no SPDX tags. > > Really? I'd have sworn that we were doing that even on kernel files, I don't know. I'm fine either way, but I do not think we should be adding SPDX tags on the u-boot side only for these files, since those will just get overwritten (removed) on the next sync with the kernel. Regards, Hans
On Fri, Sep 18, 2015 at 11:39:25AM -0400, Hans de Goede wrote: > Hi, > > On 09/18/2015 11:39 AM, Tom Rini wrote: > >On Fri, Sep 18, 2015 at 11:17:00AM -0400, Hans de Goede wrote: > >>Hi, > >> > >>On 09/18/2015 11:02 AM, Tom Rini wrote: > >>>On Fri, Sep 18, 2015 at 02:06:17PM +0200, Maxime Ripard wrote: > >>> > >>>>The R8 is very close to the A13, but it still has a few differences, > >>>>notably a composite output, which the A13 lacks. > >>>> > >>>>Add a DTSI based on the A13's to hold those differences. > >>>> > >>>>Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > >>> > >>>Other than needing to use SPDX tags instead: > >>>Reviewed-by: Tom Rini <trini@konsulko.com> > >> > >>This is in essence a partial sync with the kernel tree wrt the dts > >>files, so no SPDX tags. > > > >Really? I'd have sworn that we were doing that even on kernel files, > > I don't know. I'm fine either way, but I do not think we should be > adding SPDX tags on the u-boot side only for these files, since those > will just get overwritten (removed) on the next sync with the kernel. Given the current (and it's going to need some work to acheive and then keep) goal of just re-using kernel dts files, yeah, lets avoid noise here. I think the other places we sync have enough other stuff going on that it's not just a drop-in.
Hi, On Sat, Sep 19, 2015 at 1:39 AM, Hans de Goede <hdegoede@redhat.com> wrote: > Hi, > > On 09/18/2015 11:39 AM, Tom Rini wrote: >> >> On Fri, Sep 18, 2015 at 11:17:00AM -0400, Hans de Goede wrote: >>> >>> Hi, >>> >>> On 09/18/2015 11:02 AM, Tom Rini wrote: >>>> >>>> On Fri, Sep 18, 2015 at 02:06:17PM +0200, Maxime Ripard wrote: >>>> >>>>> The R8 is very close to the A13, but it still has a few differences, >>>>> notably a composite output, which the A13 lacks. >>>>> >>>>> Add a DTSI based on the A13's to hold those differences. >>>>> >>>>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >>>> >>>> >>>> Other than needing to use SPDX tags instead: >>>> Reviewed-by: Tom Rini <trini@konsulko.com> >>> >>> >>> This is in essence a partial sync with the kernel tree wrt the dts >>> files, so no SPDX tags. >> >> >> Really? I'd have sworn that we were doing that even on kernel files, > > > I don't know. I'm fine either way, but I do not think we should be > adding SPDX tags on the u-boot side only for these files, since those > will just get overwritten (removed) on the next sync with the kernel. Would it make sense to just add them kernel side? Thanks,
On Sat, Sep 19, 2015 at 09:31:52AM +1000, Julian Calaby wrote: > Hi, > > On Sat, Sep 19, 2015 at 1:39 AM, Hans de Goede <hdegoede@redhat.com> wrote: > > Hi, > > > > On 09/18/2015 11:39 AM, Tom Rini wrote: > >> > >> On Fri, Sep 18, 2015 at 11:17:00AM -0400, Hans de Goede wrote: > >>> > >>> Hi, > >>> > >>> On 09/18/2015 11:02 AM, Tom Rini wrote: > >>>> > >>>> On Fri, Sep 18, 2015 at 02:06:17PM +0200, Maxime Ripard wrote: > >>>> > >>>>> The R8 is very close to the A13, but it still has a few differences, > >>>>> notably a composite output, which the A13 lacks. > >>>>> > >>>>> Add a DTSI based on the A13's to hold those differences. > >>>>> > >>>>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > >>>> > >>>> > >>>> Other than needing to use SPDX tags instead: > >>>> Reviewed-by: Tom Rini <trini@konsulko.com> > >>> > >>> > >>> This is in essence a partial sync with the kernel tree wrt the dts > >>> files, so no SPDX tags. > >> > >> > >> Really? I'd have sworn that we were doing that even on kernel files, > > > > > > I don't know. I'm fine either way, but I do not think we should be > > adding SPDX tags on the u-boot side only for these files, since those > > will just get overwritten (removed) on the next sync with the kernel. > > Would it make sense to just add them kernel side? No because we use them instead of the big boiler-plate version of the license.
Hi Ian, On Fri, Sep 18, 2015 at 04:08:21PM +0100, Ian Campbell wrote: > On Fri, 2015-09-18 at 14:06 +0200, Maxime Ripard wrote: > > The R8 is very close to the A13, but it still has a few differences, > > notably a composite output, which the A13 lacks. > > > > Add a DTSI based on the A13's to hold those differences. > > Is this a direct import of one from the Linux tree? Yes, it has been submitted here: http://lists.infradead.org/pipermail/linux-arm-kernel/2015-September/371010.html It has some reviews, so it will likely change. Maxime
On Tue, 2015-09-22 at 11:17 +0200, Maxime Ripard wrote: > Hi Ian, > > On Fri, Sep 18, 2015 at 04:08:21PM +0100, Ian Campbell wrote: > > On Fri, 2015-09-18 at 14:06 +0200, Maxime Ripard wrote: > > > The R8 is very close to the A13, but it still has a few differences, > > > notably a composite output, which the A13 lacks. > > > > > > Add a DTSI based on the A13's to hold those differences. > > > > Is this a direct import of one from the Linux tree? > > Yes, it has been submitted here: > http://lists.infradead.org/pipermail/linux-arm-kernel/2015-September/3710 > 10.html > > It has some reviews, so it will likely change. Thanks, we should wait until it is queued up for Linux before applying then. Hans usually says "The dts is identical to the dts submitted to the upstream kernel." or similar in the commit message which is useful. Ian.
On Sat, Sep 19, 2015 at 07:13:27AM -0400, Tom Rini wrote: > On Sat, Sep 19, 2015 at 09:31:52AM +1000, Julian Calaby wrote: > > Hi, > > > > On Sat, Sep 19, 2015 at 1:39 AM, Hans de Goede <hdegoede@redhat.com> wrote: > > > Hi, > > > > > > On 09/18/2015 11:39 AM, Tom Rini wrote: > > >> > > >> On Fri, Sep 18, 2015 at 11:17:00AM -0400, Hans de Goede wrote: > > >>> > > >>> Hi, > > >>> > > >>> On 09/18/2015 11:02 AM, Tom Rini wrote: > > >>>> > > >>>> On Fri, Sep 18, 2015 at 02:06:17PM +0200, Maxime Ripard wrote: > > >>>> > > >>>>> The R8 is very close to the A13, but it still has a few differences, > > >>>>> notably a composite output, which the A13 lacks. > > >>>>> > > >>>>> Add a DTSI based on the A13's to hold those differences. > > >>>>> > > >>>>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > >>>> > > >>>> > > >>>> Other than needing to use SPDX tags instead: > > >>>> Reviewed-by: Tom Rini <trini@konsulko.com> > > >>> > > >>> > > >>> This is in essence a partial sync with the kernel tree wrt the dts > > >>> files, so no SPDX tags. > > >> > > >> > > >> Really? I'd have sworn that we were doing that even on kernel files, > > > > > > > > > I don't know. I'm fine either way, but I do not think we should be > > > adding SPDX tags on the u-boot side only for these files, since those > > > will just get overwritten (removed) on the next sync with the kernel. > > > > Would it make sense to just add them kernel side? > > No because we use them instead of the big boiler-plate version of the > license. I guess his point is that the DT in the kernel should have it. I'm not sure if it's something we use in the krenel. I've seen GKH nak some suggestions on this, but maybe the DT are an exception. I'll ask the arm soc maintainers, and change if they agree. Maxime
On Tue, Sep 22, 2015 at 10:20:20AM +0100, Ian Campbell wrote: > On Tue, 2015-09-22 at 11:17 +0200, Maxime Ripard wrote: > > Hi Ian, > > > > On Fri, Sep 18, 2015 at 04:08:21PM +0100, Ian Campbell wrote: > > > On Fri, 2015-09-18 at 14:06 +0200, Maxime Ripard wrote: > > > > The R8 is very close to the A13, but it still has a few differences, > > > > notably a composite output, which the A13 lacks. > > > > > > > > Add a DTSI based on the A13's to hold those differences. > > > > > > Is this a direct import of one from the Linux tree? > > > > Yes, it has been submitted here: > > http://lists.infradead.org/pipermail/linux-arm-kernel/2015-September/3710 > > 10.html > > > > It has some reviews, so it will likely change. > > Thanks, we should wait until it is queued up for Linux before applying > then. Yep. > Hans usually says "The dts is identical to the dts submitted to the > upstream kernel." or similar in the commit message which is useful. Ok, I'll add that. Thanks! Maxime
diff --git a/arch/arm/dts/sun5i-r8.dtsi b/arch/arm/dts/sun5i-r8.dtsi new file mode 100644 index 000000000000..c9ed854687ca --- /dev/null +++ b/arch/arm/dts/sun5i-r8.dtsi @@ -0,0 +1,61 @@ +/* + * Copyright 2015 Free Electrons + * Copyright 2015 NextThing Co + * + * Maxime Ripard <maxime.ripard@free-electrons.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "skeleton.dtsi" + +#include "sun5i-a13.dtsi" + +/ { + chosen { + framebuffer@1 { + compatible = "allwinner,simple-framebuffer", + "simple-framebuffer"; + allwinner,pipeline = "de_be0-lcd0-tve0"; + clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>, + <&ahb_gates 44>; + status = "disabled"; + }; + }; +};
The R8 is very close to the A13, but it still has a few differences, notably a composite output, which the A13 lacks. Add a DTSI based on the A13's to hold those differences. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/dts/sun5i-r8.dtsi | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 arch/arm/dts/sun5i-r8.dtsi