ramips: create common DTSI for Sunvalley Filehub devices

HooToo HT-TM05 and RAVPower RP-WD03 have almost identical hardware
(except for RAM size) and are from the same vendor (SunValley).

Create a common DTSI file for them.

Suggested-by: Russell Morris <rmorris@rkmorris.us>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts b/target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts
index d91986a68fc2113888a189949eceb6f5cc162ae5..ce19ef79c25e6e56a8b5b3acb6344bb554a1b7be 100644 (file)
--- a/target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts
+++ b/target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts
@@ -1,10 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "mt7620n.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7620n_sunvalley_filehub.dtsi"
 
 / {
        compatible = "hootoo,ht-tm05", "ralink,mt7620n-soc";
@@ -15,7 +12,6 @@
                led-failsafe = &led_power;
                led-running = &led_power;
                led-upgrade = &led_power;
-               label-mac-device = &ethernet;
        };
 
        leds {
@@ -33,128 +29,4 @@
                        linux,default-trigger = "phy0tpt";
                };
        };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       virtual_flash {
-               compatible = "mtd-concat";
-
-               devices = <&firmware1 &firmware2 &firmware3>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               compatible = "openwrt,okli";
-                               label = "firmware";
-                               reg = <0x0 0x0>;
-                       };
-               };
-       };
-};
-
-&gpio2 {
-       status = "okay";
-};
-
-&gpio3 {
-       status = "okay";
-};
-
-&i2c {
-       status = "okay";
-};
-
-&spi0 {
-       status = "okay";
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <50000000>;
-               m25p,fast-read;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x30000>;
-                               read-only;
-                       };
-
-                       partition@30000 {
-                               label = "config";
-                               reg = <0x30000 0x10000>;
-                               read-only;
-                       };
-
-                       factory: partition@40000 {
-                               label = "factory";
-                               reg = <0x40000 0x10000>;
-                               read-only;
-                       };
-
-                       partition@50000 {
-                               label = "loader";
-                               reg = <0x50000 0x10000>;
-                               read-only;
-                       };
-
-                       firmware2: partition@60000 {
-                               label = "firmware2";
-                               reg = <0x60000 0x170000>;
-                       };
-
-                       partition@1d0000 {
-                               label = "u-boot-env";
-                               reg = <0x1d0000 0x10000>;
-                       };
-
-                       firmware3: partition@1e0000 {
-                               label = "firmware3";
-                               reg = <0x1e0000 0x20000>;
-                       };
-
-                       firmware1: partition@200000 {
-                               label = "firmware1";
-                               reg = <0x200000 0x600000>;
-                       };
-               };
-       };
-};
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
-&ethernet {
-       mtd-mac-address = <&factory 0x28>;
-};
-
-&wmac {
-       ralink,mtd-eeprom = <&factory 0x0>;
-};
-
-&state_default {
-       gpio {
-               groups = "wled", "ephy";
-               function = "gpio";
-       };
 };

diff --git a/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts b/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts
index a5469b655ee7b55743995c91c34fa6d3f63e178f..305ac0bf20a6845c6a57d521db05291c6444e839 100644 (file)
--- a/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts
+++ b/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts
@@ -1,16 +1,12 @@
 /dts-v1/;
 
-#include "mt7620n.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7620n_sunvalley_filehub.dtsi"
 
 / {
        compatible = "ravpower,rp-wd03", "ralink,mt7620n-soc";
        model = "RAVPower RP-WD03";
 
        aliases {
-               label-mac-device = &ethernet;
                led-boot = &led_wifi_blue;
                led-failsafe = &led_wifi_blue;
                led-running = &led_wifi_blue;
@@ -30,128 +26,4 @@
                        gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
                };
        };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       virtual_flash {
-               compatible = "mtd-concat";
-
-               devices = <&firmware1 &firmware2 &firmware3>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               compatible = "openwrt,okli";
-                               label = "firmware";
-                               reg = <0x0 0x0>;
-                       };
-               };
-       };
-};
-
-&gpio2 {
-       status = "okay";
-};
-
-&gpio3 {
-       status = "okay";
-};
-
-&i2c {
-       status = "okay";
-};
-
-&spi0 {
-       status = "okay";
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <50000000>;
-               m25p,fast-read;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x30000>;
-                               read-only;
-                       };
-
-                       partition@30000 {
-                               label = "config";
-                               reg = <0x30000 0x10000>;
-                               read-only;
-                       };
-
-                       factory: partition@40000 {
-                               label = "factory";
-                               reg = <0x40000 0x10000>;
-                               read-only;
-                       };
-
-                       partition@50000 {
-                               label = "loader";
-                               reg = <0x50000 0x10000>;
-                               read-only;
-                       };
-
-                       firmware2: partition@60000 {
-                               label = "firmware2";
-                               reg = <0x60000 0x170000>;
-                       };
-
-                       partition@1d0000 {
-                               label = "u-boot-env";
-                               reg = <0x1d0000 0x10000>;
-                       };
-
-                       firmware3: partition@1e0000 {
-                               label = "firmware3";
-                               reg = <0x1e0000 0x20000>;
-                       };
-
-                       firmware1: partition@200000 {
-                               label = "firmware1";
-                               reg = <0x200000 0x600000>;
-                       };
-               };
-       };
-};
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
-&ethernet {
-       mtd-mac-address = <&factory 0x28>;
-};
-
-&wmac {
-       ralink,mtd-eeprom = <&factory 0x0>;
-};
-
-&state_default {
-       gpio {
-               groups = "wled", "ephy";
-               function = "gpio";
-       };
 };

diff --git a/target/linux/ramips/dts/mt7620n_sunvalley_filehub.dtsi b/target/linux/ramips/dts/mt7620n_sunvalley_filehub.dtsi
new file mode 100644 (file)
index 0000000..d94379a
--- /dev/null
+++ b/target/linux/ramips/dts/mt7620n_sunvalley_filehub.dtsi
@@ -0,0 +1,136 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "mt7620n.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+       aliases {
+               label-mac-device = &ethernet;
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               reset {
+                       label = "reset";
+                       gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
+               };
+       };
+
+       virtual_flash {
+               compatible = "mtd-concat";
+
+               devices = <&firmware1 &firmware2 &firmware3>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               compatible = "openwrt,okli";
+                               label = "firmware";
+                               reg = <0x0 0x0>;
+                       };
+               };
+       };
+};
+
+&gpio2 {
+       status = "okay";
+};
+
+&gpio3 {
+       status = "okay";
+};
+
+&i2c {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <50000000>;
+               m25p,fast-read;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "config";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               label = "loader";
+                               reg = <0x50000 0x10000>;
+                               read-only;
+                       };
+
+                       firmware2: partition@60000 {
+                               label = "firmware2";
+                               reg = <0x60000 0x170000>;
+                       };
+
+                       partition@1d0000 {
+                               label = "u-boot-env";
+                               reg = <0x1d0000 0x10000>;
+                       };
+
+                       firmware3: partition@1e0000 {
+                               label = "firmware3";
+                               reg = <0x1e0000 0x20000>;
+                       };
+
+                       firmware1: partition@200000 {
+                               label = "firmware1";
+                               reg = <0x200000 0x600000>;
+                       };
+               };
+       };
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0x0>;
+};
+
+&state_default {
+       gpio {
+               groups = "wled", "ephy";
+               function = "gpio";
+       };
+};