| Message ID | 20170214085919.3997-1-ralph.sennhauser@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2017-02-14 09:59, Ralph Sennhauser wrote: > The Linksys WRT1900ACS (Shelby) is another Armada 385 based router in > the Linksys WRT AC Series which got released in October 2015. > > The file armada-385-linksys-shelby.dts is taken from OpenWrt as-is and > originally authored by Imre Kaloz. > > URL: http://tinyurl.com/j8lz83a > CC: Imre Kaloz <kaloz@openwrt.org> > Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> > --- > Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
On Tue, Feb 14, 2017 at 09:59:17AM +0100, Ralph Sennhauser wrote: > The Linksys WRT1900ACS (Shelby) is another Armada 385 based router in > the Linksys WRT AC Series which got released in October 2015. > > The file armada-385-linksys-shelby.dts is taken from OpenWrt as-is and > originally authored by Imre Kaloz. > > URL: http://tinyurl.com/j8lz83a > CC: Imre Kaloz <kaloz@openwrt.org> > Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> Hi Ralph Thanks for importing this from Openwrt. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hi Ralph, Imre, On Tue, Feb 14, 2017 at 09:59:17AM +0100, Ralph Sennhauser wrote: > The Linksys WRT1900ACS (Shelby) is another Armada 385 based router in > the Linksys WRT AC Series which got released in October 2015. > > The file armada-385-linksys-shelby.dts is taken from OpenWrt as-is and > originally authored by Imre Kaloz. > > URL: http://tinyurl.com/j8lz83a Could you please change this to: https://github.com/openwrt/openwrt/blob/8466384db1154a107b86bf3ca10b166a21bd81d0/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts Or, say 'imported from https://github.com/openwrt/openwrt commit 8466384db115 "mvebu: add support for 4.1 and switch over"' or something similar? Other than that, Acked-by: Jason Cooper <jason@lakedaemon.net> thx, Jason.
On Tue, 14 Feb 2017 17:55:33 +0000 Jason Cooper <jason@lakedaemon.net> wrote: > Hi Ralph, Imre, > > On Tue, Feb 14, 2017 at 09:59:17AM +0100, Ralph Sennhauser wrote: > > The Linksys WRT1900ACS (Shelby) is another Armada 385 based router > > in the Linksys WRT AC Series which got released in October 2015. > > > > The file armada-385-linksys-shelby.dts is taken from OpenWrt as-is > > and originally authored by Imre Kaloz. > > > > URL: http://tinyurl.com/j8lz83a > > Could you please change this to: > > https://github.com/openwrt/openwrt/blob/8466384db1154a107b86bf3ca10b166a21bd81d0/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts Is what I had first and thought were to long to pass, so I went with this one for V2. Thanks Ralph > > Or, say 'imported from > > https://github.com/openwrt/openwrt > > commit 8466384db115 "mvebu: add support for 4.1 and switch over"' > > or something similar? > > Other than that, > > Acked-by: Jason Cooper <jason@lakedaemon.net> > > thx, > > Jason.
On Tue, Feb 14, 2017 at 2:59 AM, Ralph Sennhauser <ralph.sennhauser@gmail.com> wrote: > The Linksys WRT1900ACS (Shelby) is another Armada 385 based router in > the Linksys WRT AC Series which got released in October 2015. > > The file armada-385-linksys-shelby.dts is taken from OpenWrt as-is and > originally authored by Imre Kaloz. > > URL: http://tinyurl.com/j8lz83a > CC: Imre Kaloz <kaloz@openwrt.org> > Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/armada-385-linksys-shelby.dts | 114 ++++++++++++++++++++++++ > 2 files changed, 115 insertions(+) > create mode 100644 arch/arm/boot/dts/armada-385-linksys-shelby.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 0118084..16f1748 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -970,6 +970,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ > armada-385-db-ap.dtb \ > armada-385-linksys-caiman.dtb \ > armada-385-linksys-cobra.dtb \ > + armada-385-linksys-shelby.dtb \ > armada-385-turris-omnia.dtb \ > armada-388-clearfog.dtb \ > armada-388-clearfog-base.dtb \ > diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts > new file mode 100644 > index 0000000..c7a8ddd > --- /dev/null > +++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts > @@ -0,0 +1,114 @@ > +/* > + * Device Tree file for the Linksys WRT1900ACS (Shelby) > + * > + * Copyright (C) 2015 Imre Kaloz <kaloz@openwrt.org> > + * > + * > + * 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 licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without > + * any warranty of any kind, whether express or implied. > + * > + * 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. Use SPDX tags here: SPDX-License-Identifier: (GPL-2.0 OR MIT) While it says X11, this is really MIT license text.
On Tue, Feb 28, 2017 at 05:08:15PM -0600, Rob Herring wrote: > On Tue, Feb 14, 2017 at 2:59 AM, Ralph Sennhauser > <ralph.sennhauser@gmail.com> wrote: > > The Linksys WRT1900ACS (Shelby) is another Armada 385 based router in > > the Linksys WRT AC Series which got released in October 2015. > > > > The file armada-385-linksys-shelby.dts is taken from OpenWrt as-is and > > originally authored by Imre Kaloz. > > > > URL: http://tinyurl.com/j8lz83a > > CC: Imre Kaloz <kaloz@openwrt.org> > > Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> > > --- > > arch/arm/boot/dts/Makefile | 1 + > > arch/arm/boot/dts/armada-385-linksys-shelby.dts | 114 ++++++++++++++++++++++++ > > 2 files changed, 115 insertions(+) > > create mode 100644 arch/arm/boot/dts/armada-385-linksys-shelby.dts > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > index 0118084..16f1748 100644 > > --- a/arch/arm/boot/dts/Makefile > > +++ b/arch/arm/boot/dts/Makefile > > @@ -970,6 +970,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ > > armada-385-db-ap.dtb \ > > armada-385-linksys-caiman.dtb \ > > armada-385-linksys-cobra.dtb \ > > + armada-385-linksys-shelby.dtb \ > > armada-385-turris-omnia.dtb \ > > armada-388-clearfog.dtb \ > > armada-388-clearfog-base.dtb \ > > diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts > > new file mode 100644 > > index 0000000..c7a8ddd > > --- /dev/null > > +++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts > > @@ -0,0 +1,114 @@ > > +/* > > + * Device Tree file for the Linksys WRT1900ACS (Shelby) > > + * > > + * Copyright (C) 2015 Imre Kaloz <kaloz@openwrt.org> > > + * > > + * > > + * 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 licensed under the terms of the GNU General Public > > + * License version 2. This program is licensed "as is" without > > + * any warranty of any kind, whether express or implied. > > + * > > + * 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. > > Use SPDX tags here: > > SPDX-License-Identifier: (GPL-2.0 OR MIT) > > While it says X11, this is really MIT license text. No. As per my previous mail.
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 0118084..16f1748 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -970,6 +970,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ armada-385-db-ap.dtb \ armada-385-linksys-caiman.dtb \ armada-385-linksys-cobra.dtb \ + armada-385-linksys-shelby.dtb \ armada-385-turris-omnia.dtb \ armada-388-clearfog.dtb \ armada-388-clearfog-base.dtb \ diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts new file mode 100644 index 0000000..c7a8ddd --- /dev/null +++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts @@ -0,0 +1,114 @@ +/* + * Device Tree file for the Linksys WRT1900ACS (Shelby) + * + * Copyright (C) 2015 Imre Kaloz <kaloz@openwrt.org> + * + * + * 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 licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without + * any warranty of any kind, whether express or implied. + * + * 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 "armada-385-linksys.dtsi" + +/ { + model = "Linksys WRT1900ACS"; + compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385", + "marvell,armada380"; + + soc { + internal-regs{ + i2c@11000 { + + pca9635@68 { + #address-cells = <1>; + #size-cells = <0>; + + wan_amber@0 { + label = "shelby:amber:wan"; + reg = <0x0>; + }; + + wan_white@1 { + label = "shelby:white:wan"; + reg = <0x1>; + }; + + wlan_2g@2 { + label = "shelby:white:wlan_2g"; + reg = <0x2>; + }; + + wlan_5g@3 { + label = "shelby:white:wlan_5g"; + reg = <0x3>; + }; + + usb2@5 { + label = "shelby:white:usb2"; + reg = <0x5>; + }; + + usb3_1@6 { + label = "shelby:white:usb3_1"; + reg = <0x6>; + }; + + usb3_2@7 { + label = "shelby:white:usb3_2"; + reg = <0x7>; + }; + + wps_white@8 { + label = "shelby:white:wps"; + reg = <0x8>; + }; + + wps_amber@9 { + label = "shelby:amber:wps"; + reg = <0x9>; + }; + }; + }; + }; + }; + + gpio-leds { + power { + label = "shelby:white:power"; + }; + + sata { + label = "shelby:white:sata"; + }; + }; +};
The Linksys WRT1900ACS (Shelby) is another Armada 385 based router in the Linksys WRT AC Series which got released in October 2015. The file armada-385-linksys-shelby.dts is taken from OpenWrt as-is and originally authored by Imre Kaloz. URL: http://tinyurl.com/j8lz83a CC: Imre Kaloz <kaloz@openwrt.org> Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/armada-385-linksys-shelby.dts | 114 ++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 arch/arm/boot/dts/armada-385-linksys-shelby.dts