ramips: create common DTSI for TP-Link Archer C20i/C20 v1/C50 v1

The TP-Link Archer C20i/C20 v1/C50 v1 seem to be almost the same,
so creating a common DTSI will reduce duplicate code.

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

diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
index bc47f52d23537240b179fb022ac2af68518c8a85..23719c3f3555a2416314e9931e0fbbfc7a00b2f1 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
@@ -1,9 +1,6 @@
 /dts-v1/;
 
-#include "mt7620a.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
+#include "mt7620a_tplink_archer.dtsi"
 
 / {
        compatible = "tplink,archer-c20-v1", "ralink,mt7620a-soc";
@@ -16,10 +13,6 @@
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        leds {
                compatible = "gpio-leds";
 
@@ -66,86 +59,6 @@
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
        };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-
-               rfkill {
-                       label = "rfkill";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RFKILL>;
-               };
-       };
-};
-
-&gpio1 {
-       status = "okay";
-};
-
-&gpio2 {
-       status = "okay";
-};
-
-&gpio3 {
-       status = "okay";
-};
-
-&spi0 {
-       status = "okay";
-
-       m25p80@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <10000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x20000>;
-                               read-only;
-                       };
-
-                       partition@20000 {
-                               compatible = "tplink,firmware";
-                               label = "firmware";
-                               reg = <0x20000 0x7a0000>;
-                       };
-
-                       partition@7c0000 {
-                               label = "config";
-                               reg = <0x7c0000 0x10000>;
-                               read-only;
-                       };
-
-                       rom: partition@7d0000 {
-                               label = "rom";
-                               reg = <0x7d0000 0x10000>;
-                               read-only;
-                       };
-
-                       partition@7e0000 {
-                               label = "romfile";
-                               reg = <0x7e0000 0x10000>;
-                               read-only;
-                       };
-
-                       radio: partition@7f0000 {
-                               label = "radio";
-                               reg = <0x7f0000 0x10000>;
-                               read-only;
-                       };
-               };
-       };
 };
 
 &pinctrl {
@@ -157,42 +70,15 @@
        };
 };
 
-&ethernet {
-               pinctrl-names = "default";
-               mtd-mac-address = <&rom 0xf100>;
-               mediatek,portmap = "wllll";
-       };
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
-&gsw {
-       mediatek,port4 = "ephy";
-};
-
 &wmac {
-       ralink,mtd-eeprom = <&radio 0>;
-       mtd-mac-address = <&rom 0xf100>;
-       mtd-mac-address-increment = <(-2)>;
        pinctrl-names = "default";
        pinctrl-0 = <&pa_pins>;
-};
 
-&pcie {
-       status = "okay";
+       mtd-mac-address = <&rom 0xf100>;
+       mtd-mac-address-increment = <(-2)>;
 };
 
-&pcie0 {
-       mt76@0,0 {
-               reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x8000>;
-               ieee80211-freq-limit = <5000000 6000000>;
-               mtd-mac-address = <&rom 0xf100>;
-               mtd-mac-address-increment = <(-1)>;
-       };
+&wifi {
+       mtd-mac-address = <&rom 0xf100>;
+       mtd-mac-address-increment = <(-1)>;
 };

diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
index 5ee6d67192bb94cda4145f234909bf27d3019977..975e0af661fdc64beb4ed81933600395cdb2b78e 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
@@ -1,9 +1,6 @@
 /dts-v1/;
 
-#include "mt7620a.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7620a_tplink_archer.dtsi"
 
 / {
        compatible = "tplink,archer-c20i", "ralink,mt7620a-soc";
@@ -13,10 +10,6 @@
                label-mac-device = &ethernet;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        leds {
                compatible = "gpio-leds";
 
@@ -47,82 +40,6 @@
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
        };
-
-       keys {
-               compatible = "gpio-keys";
-
-               rfkill {
-                       label = "rfkill";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RFKILL>;
-               };
-
-               reset_wps {
-                       label = "reset_wps";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-};
-
-&gpio1 {
-       status = "okay";
-};
-
-&gpio2 {
-       status = "okay";
-};
-
-&gpio3 {
-       status = "okay";
-};
-
-&spi0 {
-       status = "okay";
-
-       m25p80@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <10000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x20000>;
-                               read-only;
-                       };
-
-                       partition@20000 {
-                               compatible = "tplink,firmware";
-                               label = "firmware";
-                               reg = <0x20000 0x7a0000>;
-                       };
-
-                       partition@7c0000 {
-                               label = "config";
-                               reg = <0x7c0000 0x10000>;
-                       };
-
-                       rom: partition@7d0000 {
-                               label = "rom";
-                               reg = <0x7d0000 0x10000>;
-                       };
-
-                       partition@7e0000 {
-                               label = "romfile";
-                               reg = <0x7e0000 0x10000>;
-                       };
-
-                       radio: partition@7f0000 {
-                               label = "radio";
-                               reg = <0x7f0000 0x10000>;
-                       };
-               };
-       };
 };
 
 &pinctrl {
@@ -133,37 +50,3 @@
                };
        };
 };
-
-&ethernet {
-               pinctrl-names = "default";
-               mtd-mac-address = <&rom 0xf100>;
-               mediatek,portmap = "wllll";
-       };
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
-&gsw {
-       mediatek,port4 = "ephy";
-};
-
-&wmac {
-       ralink,mtd-eeprom = <&radio 0x0>;
-};
-
-&pcie {
-       status = "okay";
-};
-
-&pcie0 {
-       mt76@0,0 {
-               reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x8000>;
-               ieee80211-freq-limit = <5000000 6000000>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
index e53e98e32ba762e3def61c1563c46ca26a381c43..77885853ef6d9c8fa7359d5de96e56e8c37fcd72 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
@@ -1,9 +1,6 @@
 /dts-v1/;
 
-#include "mt7620a.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
+#include "mt7620a_tplink_archer.dtsi"
 
 / {
        compatible = "tplink,archer-c50-v1", "ralink,mt7620a-soc";
@@ -16,10 +13,6 @@
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        leds {
                compatible = "gpio-leds";
 
@@ -66,86 +59,6 @@
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
        };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-
-               rfkill {
-                       label = "rfkill";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RFKILL>;
-               };
-       };
-};
-
-&gpio1 {
-       status = "okay";
-};
-
-&gpio2 {
-       status = "okay";
-};
-
-&gpio3 {
-       status = "okay";
-};
-
-&spi0 {
-       status = "okay";
-
-       m25p80@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <10000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x20000>;
-                               read-only;
-                       };
-
-                       partition@20000 {
-                               compatible = "tplink,firmware";
-                               label = "firmware";
-                               reg = <0x20000 0x7a0000>;
-                       };
-
-                       partition@7c0000 {
-                               label = "config";
-                               reg = <0x7c0000 0x10000>;
-                               read-only;
-                       };
-
-                       rom: partition@7d0000 {
-                               label = "rom";
-                               reg = <0x7d0000 0x10000>;
-                               read-only;
-                       };
-
-                       partition@7e0000 {
-                               label = "romfile";
-                               reg = <0x7e0000 0x10000>;
-                               read-only;
-                       };
-
-                       radio: partition@7f0000 {
-                               label = "radio";
-                               reg = <0x7f0000 0x10000>;
-                               read-only;
-                       };
-               };
-       };
 };
 
 &pinctrl {
@@ -157,42 +70,15 @@
        };
 };
 
-&ethernet {
-               pinctrl-names = "default";
-               mtd-mac-address = <&rom 0xf100>;
-               mediatek,portmap = "wllll";
-       };
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
-&gsw {
-       mediatek,port4 = "ephy";
-};
-
 &wmac {
-       ralink,mtd-eeprom = <&radio 0x0>;
-       mtd-mac-address = <&rom 0xf100>;
-       mtd-mac-address-increment = <(-2)>;
        pinctrl-names = "default";
        pinctrl-0 = <&pa_pins>;
-};
 
-&pcie {
-       status = "okay";
+       mtd-mac-address = <&rom 0xf100>;
+       mtd-mac-address-increment = <(-2)>;
 };
 
-&pcie0 {
-       mt76@0,0 {
-               reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x8000>;
-               ieee80211-freq-limit = <5000000 6000000>;
-               mtd-mac-address = <&rom 0xf100>;
-               mtd-mac-address-increment = <(-1)>;
-       };
+&wifi {
+       mtd-mac-address = <&rom 0xf100>;
+       mtd-mac-address-increment = <(-1)>;
 };

diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer.dtsi b/target/linux/ramips/dts/mt7620a_tplink_archer.dtsi
new file mode 100644 (file)
index 0000000..dd213ad
--- /dev/null
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer.dtsi
@@ -0,0 +1,124 @@
+#include "mt7620a.dtsi"
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+       chosen {
+               bootargs = "console=ttyS0,115200";
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               reset {
+                       label = "reset";
+                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
+               };
+
+               rfkill {
+                       label = "rfkill";
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RFKILL>;
+               };
+       };
+};
+
+&gpio1 {
+       status = "okay";
+};
+
+&gpio2 {
+       status = "okay";
+};
+
+&gpio3 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <10000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x20000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               compatible = "tplink,firmware";
+                               label = "firmware";
+                               reg = <0x20000 0x7a0000>;
+                       };
+
+                       partition@7c0000 {
+                               label = "config";
+                               reg = <0x7c0000 0x10000>;
+                               read-only;
+                       };
+
+                       rom: partition@7d0000 {
+                               label = "rom";
+                               reg = <0x7d0000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@7e0000 {
+                               label = "romfile";
+                               reg = <0x7e0000 0x10000>;
+                               read-only;
+                       };
+
+                       radio: partition@7f0000 {
+                               label = "radio";
+                               reg = <0x7f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&ethernet {
+       pinctrl-names = "default";
+       mtd-mac-address = <&rom 0xf100>;
+       mediatek,portmap = "wllll";
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
+
+&gsw {
+       mediatek,port4 = "ephy";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&radio 0x0>;
+};
+
+&pcie {
+       status = "okay";
+};
+
+&pcie0 {
+       wifi: mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&radio 0x8000>;
+               ieee80211-freq-limit = <5000000 6000000>;
+       };
+};