Hi, in the commit title NETGAR -> NETGEAR.
One could additionally remove the includes in mt7621_netgear_r6850.dts Two nitpicks below. > -----Original Message----- > From: openwrt-devel [mailto:[email protected]] > On Behalf Of David Bauer > Sent: Samstag, 23. November 2019 19:05 > To: [email protected] > Subject: [OpenWrt-Devel] [PATCH] ramips: reorganize NETGAR sercomm > boards > > This re-organizes the device-tree files for the Sercomm-manufactured > NETGEAR routers. They are now split into two different base-boards, from > which the respective model is extended. > > This partially reverts commit c7842ceaaa27 ("ramips: reorganize DTSI files for > Netgear R devices"), which introduced inheritance between two completely > unrelated base-boards. > > Signed-off-by: David Bauer <[email protected]> > --- > .../linux/ramips/dts/mt7621_netgear_r6220.dts | 35 ++------ ...m.dtsi => > mt7621_netgear_sercomm_ayx.dtsi} | 26 ++++++ > .../dts/mt7621_netgear_sercomm_chj.dtsi | 90 ++++++++++++++++++- > .../ramips/dts/mt7621_netgear_wndr3700-v5.dts | 35 ++------ > 4 files changed, 125 insertions(+), 61 deletions(-) rename > target/linux/ramips/dts/{mt7621_netgear_sercomm.dtsi => > mt7621_netgear_sercomm_ayx.dtsi} (80%) > > diff --git a/target/linux/ramips/dts/mt7621_netgear_r6220.dts > b/target/linux/ramips/dts/mt7621_netgear_r6220.dts > index f23e12b852..4779b71c1d 100644 > --- a/target/linux/ramips/dts/mt7621_netgear_r6220.dts > +++ b/target/linux/ramips/dts/mt7621_netgear_r6220.dts > @@ -1,40 +1,11 @@ > // SPDX-License-Identifier: GPL-2.0 > /dts-v1/; > > -#include "mt7621_netgear_sercomm.dtsi" > +#include "mt7621_netgear_sercomm_ayx.dtsi" > > / { > compatible = "netgear,r6220", "mediatek,mt7621-soc"; > model = "Netgear R6220"; > - > - keys { > - compatible = "gpio-keys"; > - > - wps { > - label = "wps"; > - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; > - linux,code = <KEY_WPS_BUTTON>; > - }; > - > - wifi { > - label = "wifi"; > - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; > - linux,code = <KEY_RFKILL>; > - }; > - > - reset { > - label = "reset"; > - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; > - linux,code = <KEY_RESTART>; > - }; > - }; > -}; > - > -&leds { > - wps { > - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; > - label = "r6220:green:wps"; > - }; > }; > > &led_power { > @@ -53,6 +24,10 @@ > label = "r6220:green:wifi"; > }; > > +&led_wps { > + label = "r6220:green:wps"; > +}; > + > &nand { > status = "okay"; > > diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm.dtsi > b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi > similarity index 80% > rename from target/linux/ramips/dts/mt7621_netgear_sercomm.dtsi > rename to target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi > index 7cff51a090..4e6e91ed8f 100644 > --- a/target/linux/ramips/dts/mt7621_netgear_sercomm.dtsi > +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi > @@ -21,6 +21,28 @@ > bootargs = "console=ttyS0,57600"; > }; > > + keys { > + compatible = "gpio-keys"; > + > + wps { > + label = "wps"; > + gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; > + linux,code = <KEY_WPS_BUTTON>; > + }; > + > + wifi { > + label = "wifi"; > + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; > + linux,code = <KEY_RFKILL>; > + }; > + > + reset { > + label = "reset"; > + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; > + linux,code = <KEY_RESTART>; > + }; > + }; > + > leds: leds { This label can be removed. It shouldn't be needed anymore ... > compatible = "gpio-leds"; > > @@ -42,6 +64,10 @@ > gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; > linux,default-trigger = "phy0tpt"; > }; > + > + led_wps: wps { > + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; > + }; > }; > > reg_usb_vbus: regulator { > diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi > b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi > index d09585a753..f2222a1412 100644 > --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi > +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi > @@ -1,9 +1,49 @@ > // SPDX-License-Identifier: GPL-2.0 > /dts-v1/; > > -#include "mt7621_netgear_sercomm.dtsi" > +#include "mt7621.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > > / { > + compatible = "mediatek,mt7621-soc"; > + > + aliases { > + led-boot = &led_power; > + led-failsafe = &led_power; > + led-running = &led_power; > + led-upgrade = &led_power; > + label-mac-device = ðernet; > + }; > + > + chosen { > + bootargs = "console=ttyS0,57600"; > + }; > + > + leds: leds { This label can be removed, too. Best Adrian
openpgp-digital-signature.asc
Description: PGP signature
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
