ramips: mt7621: convert to nvmem-layout

[openwrt/staging/nbd.git] / target / linux / ramips / dts / mt7621_lenovo_newifi-d1.dts

diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
index 984c886ff3b7b2438627f3988f9ef5ec32acbaf4..dd8d22445429b399be50b4459d10edb65375c9f8 100644 (file)
--- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
+++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -7,7 +5,7 @@
 
 / {
        compatible = "lenovo,newifi-d1", "mediatek,mt7621-soc";
-       model = "Newifi-D1";
+       model = "Lenovo Newifi D1";
 
        aliases {
                led-boot = &led_blue;
@@ -25,17 +23,17 @@
                compatible = "gpio-leds";
 
                status-red {
-                       label = "newifi-d1:red:status";
+                       label = "red:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                status-green {
-                       label = "newifi-d1:green:status";
+                       label = "green:status";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_blue: status-blue {
-                       label = "newifi-d1:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
@@ -49,6 +47,12 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
+
+               wps {
+                       label = "wps";
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
+               };
        };
 
        gpio_export {
@@ -76,11 +80,11 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
-               compatible = "mx25l25635f", "jedec,spi-nor";
+       flash@0 {
+               compatible = "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <25000000>;
-               m25p,fast-read;
+               spi-max-frequency = <45000000>;
+               broken-flash-reset;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -103,6 +107,28 @@
                                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_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -121,7 +147,8 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
@@ -129,12 +156,29 @@
 &pcie1 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0000>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
        };
 };
 
 &gmac0 {
-       mtd-mac-address = <&factory 0xe000>;
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy4>;
+
+       nvmem-cells = <&macaddr_factory_e006>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy4: ethernet-phy@4 {
+               reg = <4>;
+       };
 };
 
 &switch0 {
@@ -148,18 +192,12 @@
                        status = "okay";
                        label = "lan1";
                };
-
-               port@4 {
-                       status = "okay";
-                       label = "wan";
-                       mtd-mac-address = <&factory 0xe006>;
-               };
        };
 };
 
 &state_default {
        gpio {
-               groups = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c";
+               groups = "jtag", "uart2", "wdt";
                function = "gpio";
        };
 };