ath79: rename DTSI for Netgear WNDR devices based on ar7161

This renames the DTSI for Netgear WNDR devices based on ar7161 to
indicate that the file is not limited to WNDR3700 models.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
new file mode 100644 (file)
index 0000000..f1db1ff
--- /dev/null
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -0,0 +1,237 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar7100.dtsi"
+
+/ {
+       aliases {
+               led-boot = &led_power_orange;
+               led-failsafe = &led_power_orange;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_orange;
+               label-mac-device = &eth0;
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200";
+       };
+
+       extosc: ref {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-output-names = "ref";
+               clock-frequency = <40000000>;
+       };
+
+       reset-leds {
+               compatible = "reset-leds";
+
+               usb_led {
+                       label = "netgear:green:usb";
+                       resets = <&rst 12>;
+                       trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
+                       linux,default-trigger = "usbport";
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               wps {
+                       label = "netgear:orange:wps";
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+               };
+
+               led_power_green: power_green {
+                       label = "netgear:green:power";
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+               };
+
+               led_power_orange: power_orange {
+                       label = "netgear:orange:power";
+                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
+               };
+
+               wps_green {
+                       label = "netgear:green:wps";
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+               };
+
+               wan_green {
+                       label = "netgear:green:wan";
+                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       ath9k-leds {
+               compatible = "gpio-leds";
+
+               wlan2g {
+                       label = "netgear:green:wlan2g";
+                       gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy0tpt";
+               };
+               wlan5g {
+                       label = "netgear:blue:wlan5g";
+                       gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy1tpt";
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               wps {
+                       label = "wps";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+               };
+
+               reset {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+               };
+
+               rfkill {
+                       label = "rfkill";
+                       linux,code = <KEY_RFKILL>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       rtl8366s {
+               compatible = "realtek,rtl8366s";
+
+               gpio-sda = <&gpio 5 GPIO_ACTIVE_HIGH>;
+               gpio-sck = <&gpio 7 GPIO_ACTIVE_HIGH>;
+
+               mdio-bus {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "okay";
+
+                       phy-mask = <0x10>;
+
+                       phy4: ethernet-phy@4 {
+                               reg = <4>;
+                               phy-mode = "rgmii";
+                       };
+               };
+       };
+};
+
+&usb_phy {
+       status = "okay";
+};
+
+&usb1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       status = "okay";
+
+       usb_ohci_port: port@1 {
+               reg = <1>;
+               #trigger-source-cells = <0>;
+       };
+};
+
+&usb2 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       status = "okay";
+
+       usb_ehci_port: port@1 {
+               reg = <1>;
+               #trigger-source-cells = <0>;
+       };
+};
+
+&pcie0 {
+       status = "okay";
+
+       ath9k0: wifi@0,11 {
+               compatible = "pci168c,0029";
+               reg = <0x8800 0 0 0 0>;
+               mtd-mac-address = <&art 0x0>;
+               qca,no-eeprom;
+               #gpio-cells = <2>;
+               gpio-controller;
+
+               /* all WNDR3700 variants have four antennae dedicated
+                * to the 2.4GHz radio. Two antennae are available for
+                * each chain. The following configuration is the
+                * default setting which taken from the vendor's wifi
+                * code for that radio.
+                *
+                * All possible options [GPIO6,GPIO7,GPIO8,GPIO9]:
+                *      [0,1,0,1], [0,1,1,0], [1,0,0,1], [1,0,1,0]
+                */
+               antenna-demux {
+                       gpio-hog;
+                       line-name = "fixed antenna group 1";
+                       gpios = <6 GPIO_ACTIVE_LOW>,
+                               <7 GPIO_ACTIVE_HIGH>,
+                               <8 GPIO_ACTIVE_LOW>,
+                               <9 GPIO_ACTIVE_HIGH>;
+                       output-high;
+               };
+       };
+
+       ath9k1: wifi@0,12 {
+               compatible = "pci168c,0029";
+               reg = <0x9000 0 0 0 0>;
+               mtd-mac-address = <&art 0xc>;
+               qca,no-eeprom;
+               #gpio-cells = <2>;
+               gpio-controller;
+       };
+};
+
+&uart {
+       status = "okay";
+};
+
+&spi {
+       status = "okay";
+
+       num-cs = <1>;
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <25000000>;
+
+               partitions: partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+               };
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       pll-data = <0x11110000 0x00001099 0x00991099>;
+
+       mtd-mac-address = <&art 0x00>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&eth1 {
+       status = "okay";
+
+       pll-data = <0x11110000 0x00001099 0x00991099>;
+
+       mtd-mac-address = <&art 0x06>;
+
+       phy-handle = <&phy4>;
+};

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts
index 96573bdf14fbac2697795a578fe1e56cf1afe66c..202b443a0c30109abaa29999773a6092d60f2cf5 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7161_netgear_wndr3700.dtsi"
+#include "ar7161_netgear_wndr.dtsi"
 
 / {
        compatible = "netgear,wndr3700-v2", "qca,ar7161";

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
index 38a1140968839df82a5a8978112532d5f7b99130..3ca92837e51a7900c5aee05d3445a9f387bb487d 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7161_netgear_wndr3700.dtsi"
+#include "ar7161_netgear_wndr.dtsi"
 
 / {
        compatible = "netgear,wndr3700", "qca,ar7161";

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
deleted file mode 100644 (file)
index f1db1ff..0000000
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
+++ /dev/null
@@ -1,237 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar7100.dtsi"
-
-/ {
-       aliases {
-               led-boot = &led_power_orange;
-               led-failsafe = &led_power_orange;
-               led-running = &led_power_green;
-               led-upgrade = &led_power_orange;
-               label-mac-device = &eth0;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
-       extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-output-names = "ref";
-               clock-frequency = <40000000>;
-       };
-
-       reset-leds {
-               compatible = "reset-leds";
-
-               usb_led {
-                       label = "netgear:green:usb";
-                       resets = <&rst 12>;
-                       trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
-                       linux,default-trigger = "usbport";
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               wps {
-                       label = "netgear:orange:wps";
-                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-               };
-
-               led_power_green: power_green {
-                       label = "netgear:green:power";
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-               };
-
-               led_power_orange: power_orange {
-                       label = "netgear:orange:power";
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
-               };
-
-               wps_green {
-                       label = "netgear:green:wps";
-                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-               };
-
-               wan_green {
-                       label = "netgear:green:wan";
-                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       ath9k-leds {
-               compatible = "gpio-leds";
-
-               wlan2g {
-                       label = "netgear:green:wlan2g";
-                       gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-               wlan5g {
-                       label = "netgear:blue:wlan5g";
-                       gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wps {
-                       label = "wps";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
-               };
-
-               reset {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-               };
-
-               rfkill {
-                       label = "rfkill";
-                       linux,code = <KEY_RFKILL>;
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       rtl8366s {
-               compatible = "realtek,rtl8366s";
-
-               gpio-sda = <&gpio 5 GPIO_ACTIVE_HIGH>;
-               gpio-sck = <&gpio 7 GPIO_ACTIVE_HIGH>;
-
-               mdio-bus {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "okay";
-
-                       phy-mask = <0x10>;
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               phy-mode = "rgmii";
-                       };
-               };
-       };
-};
-
-&usb_phy {
-       status = "okay";
-};
-
-&usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       status = "okay";
-
-       usb_ohci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
-};
-
-&usb2 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       status = "okay";
-
-       usb_ehci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
-};
-
-&pcie0 {
-       status = "okay";
-
-       ath9k0: wifi@0,11 {
-               compatible = "pci168c,0029";
-               reg = <0x8800 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
-               qca,no-eeprom;
-               #gpio-cells = <2>;
-               gpio-controller;
-
-               /* all WNDR3700 variants have four antennae dedicated
-                * to the 2.4GHz radio. Two antennae are available for
-                * each chain. The following configuration is the
-                * default setting which taken from the vendor's wifi
-                * code for that radio.
-                *
-                * All possible options [GPIO6,GPIO7,GPIO8,GPIO9]:
-                *      [0,1,0,1], [0,1,1,0], [1,0,0,1], [1,0,1,0]
-                */
-               antenna-demux {
-                       gpio-hog;
-                       line-name = "fixed antenna group 1";
-                       gpios = <6 GPIO_ACTIVE_LOW>,
-                               <7 GPIO_ACTIVE_HIGH>,
-                               <8 GPIO_ACTIVE_LOW>,
-                               <9 GPIO_ACTIVE_HIGH>;
-                       output-high;
-               };
-       };
-
-       ath9k1: wifi@0,12 {
-               compatible = "pci168c,0029";
-               reg = <0x9000 0 0 0 0>;
-               mtd-mac-address = <&art 0xc>;
-               qca,no-eeprom;
-               #gpio-cells = <2>;
-               gpio-controller;
-       };
-};
-
-&uart {
-       status = "okay";
-};
-
-&spi {
-       status = "okay";
-
-       num-cs = <1>;
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
-
-               partitions: partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-               };
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       pll-data = <0x11110000 0x00001099 0x00991099>;
-
-       mtd-mac-address = <&art 0x00>;
-
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
-};
-
-&eth1 {
-       status = "okay";
-
-       pll-data = <0x11110000 0x00001099 0x00991099>;
-
-       mtd-mac-address = <&art 0x06>;
-
-       phy-handle = <&phy4>;
-};

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
index 0959bf4d973703208613d350502f53a76f19bc02..d55d4301506d68318360e2ce01b36a4c3a23f138 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7161_netgear_wndr3700.dtsi"
+#include "ar7161_netgear_wndr.dtsi"
 
 / {
        compatible = "netgear,wndr3800", "qca,ar7161";

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts
index 84a859b8caf095558135b4f1a1be759997dce3f7..8eca5b96014e34ffb833b8c09a014d6f9421660f 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7161_netgear_wndr3700.dtsi"
+#include "ar7161_netgear_wndr.dtsi"
 
 / {
        compatible = "netgear,wndr3800ch", "qca,ar7161";