ramips: mt7621: nix mac-address-increment

[openwrt/staging/hauke.git] / target / linux / ramips / dts / mt7621_telco-electronics_x1.dts

diff --git a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
index 29aeb85b1903ccc44c5c667cae3c0b3c374d65b7..4d8fa7f320d94aa023a91e3bebcdb31920a3ed47 100644 (file)
--- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
+++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
@@ -34,47 +34,47 @@
                compatible = "gpio-leds";
 
                system_led: system {
-                       label = "x1:green:system";
+                       label = "green:system";
                        gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
                };
 
                modem_offline {
-                       label = "x1:red:modem-offline";
+                       label = "red:modem-offline";
                        gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
                };
 
                modem_4g {
-                       label = "x1:blue:modem-4g";
+                       label = "blue:modem-4g";
                        gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
                };
 
                modem_3g {
-                       label = "x1:green:modem-3g";
+                       label = "green:modem-3g";
                        gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_lowest {
-                       label = "x1:green:modem-rssi-lowest";
+                       label = "green:modem-rssi-lowest";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_low {
-                       label = "x1:green:modem-rssi-low";
+                       label = "green:modem-rssi-low";
                        gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_medium {
-                       label = "x1:green:modem-rssi-medium";
+                       label = "green:modem-rssi-medium";
                        gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_high {
-                       label = "x1:green:modem-rssi-high";
+                       label = "green:modem-rssi-high";
                        gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_highest {
-                       label = "x1:green:modem-rssi-highest";
+                       label = "green:modem-rssi-highest";
                        gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
                };
        };
@@ -109,6 +109,26 @@
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               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 0x200>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               compatible = "mac-base";
+                                               reg = <0xe006 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        firmware: partition@50000 {
@@ -120,12 +140,13 @@
        };
 };
 
-&gpio {
-       status = "okay";
+&ethernet {
+       pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
 };
 
 &gmac0 {
-       mtd-mac-address = <&factory 0xe006>;
+       nvmem-cells = <&macaddr_factory_e006 0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &switch0 {
@@ -153,8 +174,8 @@
                port@4 {
                        status = "okay";
                        label = "wan";
-                       mtd-mac-address = <&factory 0xe006>;
-                       mtd-mac-address-increment = <1>;
+                       nvmem-cells = <&macaddr_factory_e006 1>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
@@ -168,25 +189,28 @@
 
 &pcie {
        status = "okay";
+};
 
-       pcie0 {
-               wifi@0,0 {
-                       compatible = "pci14c3,7603";
-                       reg = <0x0000 0 0 0 0>;
-                       mediatek,mtd-eeprom = <&factory 0x0000>;
-                       ieee80211-freq-limit = <2400000 2500000>;
-               };
+&pcie0 {
+       wifi@0,0 {
+               compatible = "pci14c3,7603";
+               reg = <0x0000 0 0 0 0>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
+               ieee80211-freq-limit = <2400000 2500000>;
        };
+};
 
-       pcie1 {
-               wifi@0,0 {
-                       compatible = "pci14c3,7662";
-                       reg = <0x0000 0 0 0 0>;
-                       mediatek,mtd-eeprom = <&factory 0x8000>;
-                       ieee80211-freq-limit = <5000000 6000000>;
-                       led {
-                               led-sources = <2>;
-                       };
+&pcie1 {
+       wifi@0,0 {
+               compatible = "pci14c3,7662";
+               reg = <0x0000 0 0 0 0>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
+               ieee80211-freq-limit = <5000000 6000000>;
+
+               led {
+                       led-sources = <2>;
                };
        };
 };