ramips/mt7621: create common DTSI for Mikrotik devices

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7621_mikrotik_routerboard-m33g.dts

diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
index 19e1a71e993c5aeeee6cb74331948af64b505695..48d368a5a94c208454ee9df21fa180ebd29998aa 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
@@ -1,9 +1,6 @@
 /dts-v1/;
 
-#include "mt7621.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
+#include "mt7621_mikrotik.dtsi"
 
 / {
        compatible = "mikrotik,routerboard-m33g", "mediatek,mt7621-soc";
@@ -16,10 +13,6 @@
                led-upgrade = &led_usr;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        leds {
                compatible = "gpio-leds";
 
@@ -29,16 +22,6 @@
                };
        };
 
-       keys {
-               compatible = "gpio-keys";
-
-               res {
-                       label = "res";
-                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
        pcie0_vcc_reg {
                compatible = "regulator-fixed";
                regulator-name = "pcie0_vcc";
@@ -88,63 +71,10 @@
 };
 
 &spi0 {
-       status = "okay";
-
-       w25q40@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <3125000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "RouterBoot";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                               compatible = "fixed-partitions";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partition@0 {
-                                       label = "bootloader1";
-                                       reg = <0x0 0xf000>;
-                                       read-only;
-                               };
-
-                               hard_config: partition@f000 {
-                                       label = "hard_config";
-                                       reg = <0xf000 0x1000>;
-                                       read-only;
-                               };
-
-                               partition@10000 {
-                                       label = "bootloader2";
-                                       reg = <0x10000 0xf000>;
-                                       read-only;
-                               };
-
-                               partition@20000 {
-                                       label = "soft_config";
-                                       reg = <0x20000 0x1000>;
-                               };
-
-                               partition@30000 {
-                                       label = "bios";
-                                       reg = <0x30000 0x1000>;
-                                       read-only;
-                               };
-                       };
-               };
-       };
-
-       w25q128@1 {
+       flash@1 {
                compatible = "jedec,spi-nor";
                reg = <1>;
-               // XXX empiric value to obtain actual 10MHz SCK at the chip
-               spi-max-frequency = <3125000>;
+               spi-max-frequency = <33000000>;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -156,24 +86,17 @@
                        partition@40000 {
                                compatible = "mikrotik,minor";
                                label = "firmware";
-                               reg = <0x040000 0xFC0000>;
+                               reg = <0x040000 0xfc0000>;
                        };
                };
        };
 };
 
-&gmac0 {
-       mtd-mac-address = <&hard_config 0x0010>;
-       mtd-mac-address-increment = <1>;
-};
-
 &switch0 {
        ports {
                port@0 {
                        status = "okay";
                        label = "wan";
-                       mtd-mac-address = <&hard_config 0x0010>;
-                       mtd-mac-address-increment = <2>;
                };
 
                port@1 {