ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_iodata_wn-xx-xr.dtsi

diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
index 1ed9380b37331730ffeab193f0319c2d678a2ae8..b3063a333edc191ccf99e51fbdb31ec61814f97e 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -11,19 +12,21 @@
                led-failsafe = &led_power;
                led-running = &led_power;
                led-upgrade = &led_power;
-               label-mac-device = &wan;
+               label-mac-device = &gmac1;
        };
 
        leds {
                compatible = "gpio-leds";
 
                wps {
-                       label = "iodata:green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "iodata:green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -55,6 +58,11 @@
 &nand {
        status = "okay";
 
+       mediatek,bbt;
+       mediatek,bmt-remap-range =
+               <0x0000000 0x0800000>,
+               <0x3600000 0x4980000>;
+
        partitions: partitions {
                compatible = "fixed-partitions";
                #address-cells = <1>;
@@ -72,9 +80,31 @@
                        read-only;
                };
 
-               factory: partition@200000 {
+               partition@200000 {
                        label = "factory";
                        reg = <0x0200000 0x0100000>;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
+
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
+                       };
                };
 
                partition@300000 {
@@ -118,17 +148,27 @@
 };
 
 &gmac0 {
-       mtd-mac-address = <&factory 0xe000>;
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy0>;
+
+       nvmem-cells = <&macaddr_factory_e006>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
 };
 
 &switch0 {
        ports {
-               wan: port@0 {
-                       status = "okay";
-                       label = "wan";
-                       mtd-mac-address = <&factory 0xe006>;
-               };
-
                port@1 {
                        status = "okay";
                        label = "lan4";