From: Jan Hoffmann <j...@3e8.eu>
The R6220 and WNDR3700v5 are identical apart from using NAND/SPI flash and
having a different casing. This moves the common bits into R6220.dtsi,
based on the existing R6220 dts.
Now all LEDs work on WNDR3700v5 and the ethernet MAC addresses are
correct.
Signed-off-by: Jan Hoffmann <j...@3e8.eu>
---
.../ramips/base-files/etc/board.d/01_leds | 5 +-
.../ramips/base-files/etc/board.d/02_network | 3 +-
target/linux/ramips/dts/R6220.dts | 127 +++---------------
target/linux/ramips/dts/R6220.dtsi | 120 +++++++++++++++++
target/linux/ramips/dts/WNDR3700V5.dts | 109 +++------------
target/linux/ramips/image/mt7621.mk | 3 +-
6 files changed, 161 insertions(+), 206 deletions(-)
create mode 100644 target/linux/ramips/dts/R6220.dtsi
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds
b/target/linux/ramips/base-files/etc/board.d/01_leds
index ccbe53d770..ce9e87fb9d 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -282,8 +282,9 @@ px-4885-8M)
set_wifi_led "px-4885:orange:wifi"
;;
r6220|\
-netgear,r6350)
- ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2
+netgear,r6350|\
+wndr3700v5)
+ ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0"
"0x10"
set_wifi_led "$boardname:green:wifi"
;;
rakwireless,rak633)
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network
b/target/linux/ramips/base-files/etc/board.d/02_network
index dcc7b4a747..0c10118dfb 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -614,7 +614,8 @@ ramips_setup_macs()
wan_mac=$(mtd_get_mac_binary factory 46)
;;
r6220|\
- netgear,r6350)
+ netgear,r6350|\
+ wndr3700v5)
wan_mac=$(mtd_get_mac_binary factory 4)
lan_mac=$(macaddr_add "$wan_mac" 1)
;;
diff --git a/target/linux/ramips/dts/R6220.dts
b/target/linux/ramips/dts/R6220.dts
index 335351c825..35042494e7 100644
--- a/target/linux/ramips/dts/R6220.dts
+++ b/target/linux/ramips/dts/R6220.dts
@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
-#include "mt7621.dtsi"
+#include "R6220.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
@@ -8,87 +9,26 @@
/ {
compatible = "netgear,r6220", "mediatek,mt7621-soc";
model = "Netgear R6220";
+};
- aliases {
- led-boot = &led_power;
- led-failsafe = &led_power;
- led-running = &led_power;
- led-upgrade = &led_power;
- };
-
- memory@0 {
- device_type = "memory";
- reg = <0x0 0x8000000>;
- };
-
- chosen {
- bootargs = "console=ttyS0,57600";
- };
-
- leds {
- compatible = "gpio-leds";
-
- led_power: power {
- label = "r6220:green:power";
- gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
- };
-
- usb {
- label = "r6220:green:usb";
- gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
- trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
- linux,default-trigger = "usbport";
- };
-
- internet {
- label = "r6220:green:wan";
- gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
- };
-
- wifi {
- label = "r6220:green:wifi";
- gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
- };
-
- wps {
- label = "r6220:green:wps";
- gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
- };
- };
-
- keys {
- compatible = "gpio-keys-polled";
- poll-interval = <20>;
-
- wps {
- label = "wps";
- gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
- linux,code = <KEY_WPS_BUTTON>;
- };
+&led_power {
+ label = "r6220:green:power";
+};
- wifi {
- label = "wifi";
- gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
- linux,code = <KEY_RFKILL>;
- };
+&led_usb {
+ label = "r6220:green:usb";
+};
- reset {
- label = "reset";
- gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
- linux,code = <KEY_RESTART>;
- };
- };
+&led_internet {
+ label = "r6220:green:wan";
+};
- gpio_export {
- compatible = "gpio-export";
- #size-cells = <0>;
+&led_wifi {
+ label = "r6220:green:wifi";
+};
- usbpower {
- gpio-export,name = "usbpower";
- gpio-export,output = <1>;
- gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
- };
- };
+&led_wps {
+ label = "r6220:green:wps";
};
&nand {
@@ -134,36 +74,3 @@
};
};
};
-
-&pcie {
- status = "okay";
-};
-
-&pcie0 {
- mt76@0,0 {
- reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x8000>;
- ieee80211-freq-limit = <5000000 6000000>;
- };
-};
-
-&pcie1 {
- mt76@0,0 {
- reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x0000>;
- ieee80211-freq-limit = <2400000 2500000>;
- };
-};
-
-ðernet {
- mtd-mac-address = <&factory 0x00000004>;
-};
-
-&pinctrl {
- state_default: pinctrl0 {
- gpio {
- ralink,group = "uart3", "jtag";
- ralink,function = "gpio";
- };
- };
-};
diff --git a/target/linux/ramips/dts/R6220.dtsi
b/target/linux/ramips/dts/R6220.dtsi
new file mode 100644
index 0000000000..8e840fee9d
--- /dev/null
+++ b/target/linux/ramips/dts/R6220.dtsi
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#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;
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x8000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,57600";
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ led_power: power {
+ gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+ };
+
+ led_usb: usb {
+ gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+ linux,default-trigger = "usbport";
+ };
+
+ led_internet: internet {
+ gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+ };
+
+ led_wifi: wifi {
+ gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+ };
+
+ led_wps: wps {
+ gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ keys {
+ compatible = "gpio-keys-polled";
+ poll-interval = <20>;
+
+ wps {
+ label = "wps";
+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+ linux,code = <KEY_WPS_BUTTON>;
+ };
+
+ wifi {
+ label = "wifi";
+ gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+ linux,code = <KEY_RFKILL>;
+ };
+
+ reset {
+ label = "reset";
+ gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+ linux,code = <KEY_RESTART>;
+ };
+ };
+
+ gpio_export {
+ compatible = "gpio-export";
+ #size-cells = <0>;
+
+ usbpower {
+ gpio-export,name = "usbpower";
+ gpio-export,output = <1>;
+ gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
+
+&pcie {
+ status = "okay";
+};
+
+&pcie0 {
+ mt76@0,0 {
+ reg = <0x0000 0 0 0 0>;
+ mediatek,mtd-eeprom = <&factory 0x8000>;
+ ieee80211-freq-limit = <5000000 6000000>;
+ };
+};
+
+&pcie1 {
+ mt76@0,0 {
+ reg = <0x0000 0 0 0 0>;
+ mediatek,mtd-eeprom = <&factory 0x0000>;
+ ieee80211-freq-limit = <2400000 2500000>;
+ };
+};
+
+ðernet {
+ mtd-mac-address = <&factory 0x00000004>;
+};
+
+&pinctrl {
+ state_default: pinctrl0 {
+ gpio {
+ ralink,group = "uart3", "uart2", "jtag", "wdt";
+ ralink,function = "gpio";
+ };
+ };
+};
diff --git a/target/linux/ramips/dts/WNDR3700V5.dts
b/target/linux/ramips/dts/WNDR3700V5.dts
index 4ef0d70f18..7b9812fc52 100644
--- a/target/linux/ramips/dts/WNDR3700V5.dts
+++ b/target/linux/ramips/dts/WNDR3700V5.dts
@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
-#include "mt7621.dtsi"
+#include "R6220.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
@@ -8,70 +9,26 @@
/ {
compatible = "netgear,wndr3700-v5", "mediatek,mt7621-soc";
model = "Netgear WNDR3700v5";
+};
- aliases {
- led-boot = &led_power;
- led-failsafe = &led_power;
- led-running = &led_power;
- led-upgrade = &led_power;
- };
-
- memory@0 {
- device_type = "memory";
- reg = <0x0 0x8000000>;
- };
-
- chosen {
- bootargs = "console=ttyS0,57600 maxcpus=2";
- };
-
- leds {
- compatible = "gpio-leds";
-
- wps {
- label = "wndr3700v5:green:wps";
- gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
- };
-
- led_power: power {
- label = "wndr3700v5:green:power";
- gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
- };
- };
-
- keys {
- compatible = "gpio-keys-polled";
- poll-interval = <20>;
-
- wps {
- label = "wndr3700v5:wps";
- gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
- linux,code = <KEY_WPS_BUTTON>;
- };
+&led_power {
+ label = "wndr3700v5:green:power";
+};
- wifi {
- label = "wndr3700v5:wifi";
- gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
- linux,code = <KEY_RFKILL>;
- };
+&led_usb {
+ label = "wndr3700v5:green:usb";
+};
- reset {
- label = "wndr3700v5:reset";
- gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
- linux,code = <KEY_RESTART>;
- };
- };
+&led_internet {
+ label = "wndr3700v5:green:wan";
+};
- gpio_export {
- compatible = "gpio-export";
- #size-cells = <0>;
+&led_wifi {
+ label = "wndr3700v5:green:wifi";
+};
- usbpower {
- gpio-export,name = "usbpower";
- gpio-export,output = <1>;
- gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
- };
- };
+&led_wps {
+ label = "wndr3700v5:green:wps";
};
&spi0 {
@@ -113,35 +70,3 @@
};
};
};
-
-&pcie {
- status = "okay";
-};
-
-&pcie0 {
- mt76@0,0 {
- reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x8000>;
- ieee80211-freq-limit = <5000000 6000000>;
- };
-};
-
-&pcie1 {
- mt76@0,0 {
- reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x0000>;
- };
-};
-
-ðernet {
- mtd-mac-address = <&factory 0x0000000c>;
-};
-
-&pinctrl {
- state_default: pinctrl0 {
- gpio {
- ralink,group = "rgmii2", "mdio", "wdt";
- ralink,function = "gpio";
- };
- };
-};
diff --git a/target/linux/ramips/image/mt7621.mk
b/target/linux/ramips/image/mt7621.mk
index c21b9b4b63..2eb7feb5bf 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -550,7 +550,8 @@ define Device/wndr3700v5
IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | pad-to
$$$$(BLOCKSIZE) | \
sercom-footer | pad-to 128 | zip WNDR3700v5.bin | sercom-seal
DEVICE_TITLE := Netgear WNDR3700v5
- DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic
+ DEVICE_PACKAGES := \
+ kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
endef
TARGET_DEVICES += wndr3700v5
--
2.17.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
