| Message ID | 20160903082227.30559-3-narmstrong@baylibre.com |
|---|---|
| State | New |
| Headers | show |
Hi, Am 03.09.2016 um 10:22 schrieb Neil Armstrong: > From: Carlo Caione <carlo@endlessm.com> > > This patch introduces the basic support for the Amlogic S905X (Meson > GXL) and for the Amlogic evaluation board P212. > No documentation has been released yet for this SoC, so for now only the > bare minimum has been added in the DT. > > Acked-by: Rob Herring <robh@kernel.org> > Reviewed-by: Andreas Färber <afaerber@suse.de> > Signed-off-by: Carlo Caione <carlo@endlessm.com> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/devicetree/bindings/arm/amlogic.txt | 5 ++ > arch/arm64/boot/dts/amlogic/Makefile | 1 + > .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 70 ++++++++++++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 48 +++++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 48 +++++++++++++++ > 5 files changed, 172 insertions(+) > create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts > create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi > create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > > diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt > index fcc6f6c..702c911 100644 > --- a/Documentation/devicetree/bindings/arm/amlogic.txt > +++ b/Documentation/devicetree/bindings/arm/amlogic.txt > @@ -17,6 +17,10 @@ Boards with the Amlogic Meson GXBaby SoC shall have the following properties: > Required root node property: > compatible: "amlogic,meson-gxbb"; > > +Boards with the Amlogic Meson GXL SoC shall have the following properties: > + Required root node property: > + compatible: "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; Can we please use "amlogic,s905x", "amlogic,meson-gxl"? No need to complicate the name. Also affects .dtsi and .dts below. > + > Board compatible values: > - "geniatech,atv1200" (Meson6) > - "minix,neo-x8" (Meson8) > @@ -28,3 +32,4 @@ Board compatible values: > - "hardkernel,odroid-c2" (Meson gxbb) > - "amlogic,p200" (Meson gxbb) > - "amlogic,p201" (Meson gxbb) > + - "amlogic,p212" (Meson gxl s905x) [...] > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts > new file mode 100644 > index 0000000..e0df975 > --- /dev/null > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts > @@ -0,0 +1,70 @@ > +/* > + * Copyright (c) 2016 Endless Computers, Inc. > + * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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. > + */ > + > +/dts-v1/; > + > +#include "meson-gxl-s905x.dtsi" > + > +/ { > + compatible = "amlogic,p212", "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; > + model = "Amlogic Meson GXL (S905X) P212 Development Board"; Is that its official name? No objection, just wondering whether we need both GXL and S905X in the name, and then again the SoC name at all if the P212 is unique. Haven't compared the previous Pxxx ones. > + > + aliases { > + serial0 = &uart_AO; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + memory@0 { > + device_type = "memory"; > + reg = <0x0 0x0 0x0 0x80000000>; > + }; > +}; > + > +/* This UART is brought out to the DB9 connector */ > +&uart_AO { > + status = "okay"; > +}; > + Trailing white line - please watch out for that, git-am will complain. > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi > new file mode 100644 > index 0000000..b9e94f1 > --- /dev/null > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi > @@ -0,0 +1,48 @@ > +/* > + * Copyright (c) 2016 Endless Computers, Inc. > + * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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 "meson-gxl.dtsi" > + > +/ { > + compatible = "amlogic,meson-gxl", "amlogic,meson-gxl-s905x"; This needs to be reversed. > +}; [snip] Regards, Andreas
On Mon, Sep 12, 2016 at 6:28 PM, Andreas Färber <afaerber@suse.de> wrote: >> +Boards with the Amlogic Meson GXL SoC shall have the following properties: >> + Required root node property: >> + compatible: "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; > > Can we please use "amlogic,s905x", "amlogic,meson-gxl"? No need to > complicate the name. Also affects .dtsi and .dts below. gxl != s905x. AFAWK to the GXL family belong several different SoCs, like S905X, S905D, etc... (see patch 3/3) This is why we use meson-gxl-s905x, meson-gxl-s905d, etc... We could s/meson-gxl-s905x/meson-s905x/ and s/meson-gxl-s905d/meson-s905d/ but I honestly prefer this way because we can clearly see which family the SoC belongs to (the Amlogic naming convention is already messy enough). I mean, yes it's longer, but it's for the sake of documentation IMO. [cut] >> + compatible = "amlogic,p212", "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; >> + model = "Amlogic Meson GXL (S905X) P212 Development Board"; > > Is that its official name? No objection, just wondering whether we need > both GXL and S905X in the name, and then again the SoC name at all if > the P212 is unique. Haven't compared the previous Pxxx ones. P212 is the official name for the S905X Amlogic dev board. It follows the name we used for the other P20x boards. [cut] >> + >> +/* This UART is brought out to the DB9 connector */ >> +&uart_AO { >> + status = "okay"; >> +}; >> + > > Trailing white line - please watch out for that, git-am will complain. Right. [cut] >> +#include "meson-gxl.dtsi" >> + >> +/ { >> + compatible = "amlogic,meson-gxl", "amlogic,meson-gxl-s905x"; > > This needs to be reversed. Agree. Cheers,
Carlo Caione <carlo@caione.org> writes: > On Mon, Sep 12, 2016 at 6:28 PM, Andreas Färber <afaerber@suse.de> wrote: > >>> +Boards with the Amlogic Meson GXL SoC shall have the following properties: >>> + Required root node property: >>> + compatible: "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; >> >> Can we please use "amlogic,s905x", "amlogic,meson-gxl"? No need to >> complicate the name. Also affects .dtsi and .dts below. > > gxl != s905x. > > AFAWK to the GXL family belong several different SoCs, like S905X, > S905D, etc... (see patch 3/3) > This is why we use meson-gxl-s905x, meson-gxl-s905d, etc... Correct. > We could s/meson-gxl-s905x/meson-s905x/ and > s/meson-gxl-s905d/meson-s905d/ but I honestly prefer this way because > we can clearly see which family the SoC belongs to (the Amlogic naming > convention is already messy enough). > I mean, yes it's longer, but it's for the sake of documentation IMO. +1 Kevin
Am 12.09.2016 um 22:43 schrieb Kevin Hilman: > Carlo Caione <carlo@caione.org> writes: >> On Mon, Sep 12, 2016 at 6:28 PM, Andreas Färber <afaerber@suse.de> wrote: >> >>>> +Boards with the Amlogic Meson GXL SoC shall have the following properties: >>>> + Required root node property: >>>> + compatible: "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; >>> >>> Can we please use "amlogic,s905x", "amlogic,meson-gxl"? No need to >>> complicate the name. Also affects .dtsi and .dts below. >> >> gxl != s905x. Huh? You're seemingly completely missing my point... But you are right that _Neil's_ heading needs to be fixed, too: Clearly not all GXL SoCs need to have an S905X compatible string! So it should be "Boards with the Amlogic S905X SoC shall ..." or so. >> AFAWK to the GXL family belong several different SoCs, like S905X, >> S905D, etc... (see patch 3/3) Thanks, I already know that, that's why you have two compatible strings instead of just one like for GXBB. We can certainly prepend one for symmetry there, too, if it makes you happier. >> This is why we use meson-gxl-s905x, meson-gxl-s905d, etc... > > Correct. > >> We could s/meson-gxl-s905x/meson-s905x/ and >> s/meson-gxl-s905d/meson-s905d/ but I honestly prefer this way because >> we can clearly see which family the SoC belongs to (the Amlogic naming >> convention is already messy enough). >> I mean, yes it's longer, but it's for the sake of documentation IMO. > > +1 I still don't follow that conclusion. The board is called "amlogic,p231" because P231 is a unique identifier within the Amlogic namespace, so why not call the SoC "amlogic,s905x" for the same reason? The documentation is already there in having both "amlogic,s905x" _and_ "amlogic,meson-gxl" - please re-read my post. There is no S905X in GXL family and another S905X in some other Amlogic SoC family, so it's unique and there is no reason to encode any hierarchies into its name other than vendor,name. I'm not arguing over the file name, where it perfectly makes sense to have a meson-gxl- prefix (already discussed), just about the compatible string where we don't have "amlogic,meson-gxl-s905x-p231" either because it is completely unnecessary and does _not_ add any value. Not that we're checking this string anywhere anyway... If you want to check for the GXL family you have to use "amlogic,meson-gxl"; if you want to check for the specific SoC you use "amlogic,s905x". Simple. We never match partial strings, so there is no sense in a hardcoded prefix that is duplicating information already available. Regards, Andreas
On Mon, Sep 12, 2016 at 2:43 PM, Andreas Färber <afaerber@suse.de> wrote: > Am 12.09.2016 um 22:43 schrieb Kevin Hilman: >> Carlo Caione <carlo@caione.org> writes: >>> On Mon, Sep 12, 2016 at 6:28 PM, Andreas Färber <afaerber@suse.de> wrote: >>> >>>>> +Boards with the Amlogic Meson GXL SoC shall have the following properties: >>>>> + Required root node property: >>>>> + compatible: "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; >>>> >>>> Can we please use "amlogic,s905x", "amlogic,meson-gxl"? No need to >>>> complicate the name. Also affects .dtsi and .dts below. >>> >>> gxl != s905x. > > Huh? You're seemingly completely missing my point... > > But you are right that _Neil's_ heading needs to be fixed, too: > Clearly not all GXL SoCs need to have an S905X compatible string! > So it should be "Boards with the Amlogic S905X SoC shall ..." or so. > >>> AFAWK to the GXL family belong several different SoCs, like S905X, >>> S905D, etc... (see patch 3/3) > > Thanks, I already know that, that's why you have two compatible strings > instead of just one like for GXBB. We can certainly prepend one for > symmetry there, too, if it makes you happier. > >>> This is why we use meson-gxl-s905x, meson-gxl-s905d, etc... >> >> Correct. >> >>> We could s/meson-gxl-s905x/meson-s905x/ and >>> s/meson-gxl-s905d/meson-s905d/ but I honestly prefer this way because >>> we can clearly see which family the SoC belongs to (the Amlogic naming >>> convention is already messy enough). >>> I mean, yes it's longer, but it's for the sake of documentation IMO. >> >> +1 > > I still don't follow that conclusion. The board is called "amlogic,p231" > because P231 is a unique identifier within the Amlogic namespace, so why > not call the SoC "amlogic,s905x" for the same reason? The documentation > is already there in having both "amlogic,s905x" _and_ > "amlogic,meson-gxl" - please re-read my post. There is no S905X in GXL > family and another S905X in some other Amlogic SoC family, so it's > unique and there is no reason to encode any hierarchies into its name > other than vendor,name. > > I'm not arguing over the file name, where it perfectly makes sense to > have a meson-gxl- prefix (already discussed), just about the compatible > string where we don't have "amlogic,meson-gxl-s905x-p231" either because > it is completely unnecessary and does _not_ add any value. Sorry, I'm guilty of not fully reading the original post. I was thinking only of the filenames, which it seems were already agreed on to be long. > Not that we're checking this string anywhere anyway... If you want to > check for the GXL family you have to use "amlogic,meson-gxl"; if you > want to check for the specific SoC you use "amlogic,s905x". Simple. We > never match partial strings, so there is no sense in a hardcoded prefix > that is duplicating information already available. For the compatible strings, I think your proposed shorter (but still unique) forms are fine with me. Kevin
On Mon, Sep 12, 2016 at 11:43 PM, Andreas Färber <afaerber@suse.de> wrote: [cut] > I'm not arguing over the file name, where it perfectly makes sense to > have a meson-gxl- prefix (already discussed), just about the compatible > string where we don't have "amlogic,meson-gxl-s905x-p231" either because > it is completely unnecessary and does _not_ add any value. > > Not that we're checking this string anywhere anyway... If you want to > check for the GXL family you have to use "amlogic,meson-gxl"; if you > want to check for the specific SoC you use "amlogic,s905x". Simple. We > never match partial strings, so there is no sense in a hardcoded prefix > that is duplicating information already available. Ok, then. Fine with me. Neil, do you want to resend my patch or you can take care of the fixes for the whole patchset? Thanks,
On 09/13/2016 08:14 AM, Carlo Caione wrote: > On Mon, Sep 12, 2016 at 11:43 PM, Andreas Färber <afaerber@suse.de> wrote: > > [cut] >> I'm not arguing over the file name, where it perfectly makes sense to >> have a meson-gxl- prefix (already discussed), just about the compatible >> string where we don't have "amlogic,meson-gxl-s905x-p231" either because >> it is completely unnecessary and does _not_ add any value. >> >> Not that we're checking this string anywhere anyway... If you want to >> check for the GXL family you have to use "amlogic,meson-gxl"; if you >> want to check for the specific SoC you use "amlogic,s905x". Simple. We >> never match partial strings, so there is no sense in a hardcoded prefix >> that is duplicating information already available. > > Ok, then. Fine with me. > > Neil, do you want to resend my patch or you can take care of the fixes > for the whole patchset? > > Thanks, > Ok, I still need to synchronize with kevin for when and where to rebase from. Neil
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index fcc6f6c..702c911 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -17,6 +17,10 @@ Boards with the Amlogic Meson GXBaby SoC shall have the following properties: Required root node property: compatible: "amlogic,meson-gxbb"; +Boards with the Amlogic Meson GXL SoC shall have the following properties: + Required root node property: + compatible: "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; + Board compatible values: - "geniatech,atv1200" (Meson6) - "minix,neo-x8" (Meson8) @@ -28,3 +32,4 @@ Board compatible values: - "hardkernel,odroid-c2" (Meson gxbb) - "amlogic,p200" (Meson gxbb) - "amlogic,p201" (Meson gxbb) + - "amlogic,p212" (Meson gxl s905x) diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile index 47ec703..1f78b07 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts new file mode 100644 index 0000000..e0df975 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2016 Endless Computers, Inc. + * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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. + */ + +/dts-v1/; + +#include "meson-gxl-s905x.dtsi" + +/ { + compatible = "amlogic,p212", "amlogic,meson-gxl-s905x", "amlogic,meson-gxl"; + model = "Amlogic Meson GXL (S905X) P212 Development Board"; + + aliases { + serial0 = &uart_AO; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x80000000>; + }; +}; + +/* This UART is brought out to the DB9 connector */ +&uart_AO { + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi new file mode 100644 index 0000000..b9e94f1 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2016 Endless Computers, Inc. + * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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 "meson-gxl.dtsi" + +/ { + compatible = "amlogic,meson-gxl", "amlogic,meson-gxl-s905x"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi new file mode 100644 index 0000000..13b10ee --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2016 Endless Computers, Inc. + * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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 "meson-gx.dtsi" + +/ { + compatible = "amlogic,meson-gxl"; +};