ramips: mt7621: convert to nvmem-layout

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / mt7621_zbtlink_zbt-wg3526.dtsi

diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
index 48de87269a10d15025124060a5b895b06276609e..5c21352cd9e6fcd3ba1653ffbe5365fad01a36c4 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
@@ -18,18 +18,12 @@
                bootargs = "console=ttyS0,115200";
        };
 
-       palmbus: palmbus@1E000000 {
-               i2c@900 {
-                       status = "okay";
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -38,12 +32,16 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "zbt-wg3526:green:status";
-                       gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+                       label = "green:status";
+                       gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
                };
        };
 };
 
+&i2c {
+       status = "okay";
+};
+
 &sdhci {
        status = "okay";
 };
@@ -51,7 +49,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash0: flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -77,6 +75,24 @@
                                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>;
+                                       };
+                               };
                        };
 
                        firmware: partition@50000 {
@@ -95,7 +111,8 @@
        wifi0: wifi@0,0 {
                compatible = "pci14c3,7603";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0000>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
        };
 };
 
@@ -103,7 +120,8 @@
        wifi1: wifi@0,0 {
                compatible = "pci14c3,7662";
                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>;
 
                led {
@@ -113,12 +131,49 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0xe000>;
+       pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
+};
+
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+};
+
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "wan";
+                       nvmem-cells = <&macaddr_factory_e000>;
+                       nvmem-cell-names = "mac-address";
+                       mac-address-increment = <1>;
+               };
+       };
 };
 
 &state_default {
        gpio {
-               ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-               ralink,function = "gpio";
+               groups = "wdt", "rgmii2";
+               function = "gpio";
        };
 };