ramips: convert most mtd-mac-address cases in DTSI to nvmem

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / mt7628an_widora_neo.dtsi

diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
index f89342eb8f06ca56a3fe9a7a83c4d40d9074f74f..74f865aac9a340bea976b3e21f78e2eb505fa694 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
+++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
@@ -21,7 +21,7 @@
                compatible = "gpio-leds";
 
                led_wifi: wifi {
-                       label = "widora:orange:wifi";
+                       label = "orange:wifi";
                        gpios = <&wgpio 0 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
@@ -32,7 +32,7 @@
 
                wps {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -46,45 +46,95 @@
        };
 };
 
+&spi0 {
+       status = "okay";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <40000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x10000>;
+                       };
+
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       firmware: partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               /* reg property is set based on flash size in DTS files */
+                       };
+               };
+       };
+
+       spidev@1 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "linux,spidev";
+               reg = <1>;
+               spi-max-frequency = <40000000>;
+       };
+};
+
 &state_default {
        gpio {
-               ralink,group = "gpio";
-               ralink,function = "gpio";
+               groups = "gpio";
+               function = "gpio";
        };
 
        perst {
-               ralink,group = "perst";
-               ralink,function = "gpio";
+               groups = "perst";
+               function = "gpio";
        };
 
        refclk {
-               ralink,group = "refclk";
-               ralink,function = "gpio";
+               groups = "refclk";
+               function = "gpio";
        };
 
        i2s {
-               ralink,group = "i2s";
-               ralink,function = "gpio";
+               groups = "i2s";
+               function = "gpio";
        };
 
        spis {
-               ralink,group = "spis";
-               ralink,function = "gpio";
+               groups = "spis";
+               function = "gpio";
        };
 
        wled_kn {
-               ralink,group = "wled_kn";
-               ralink,function = "gpio";
+               groups = "wled_kn";
+               function = "gpio";
        };
 
        wled_an {
-               ralink,group = "wled_an";
-               ralink,function = "wled_an";
+               groups = "wled_an";
+               function = "wled_an";
        };
 
        wdt {
-               ralink,group = "wdt";
-               ralink,function = "gpio";
+               groups = "wdt";
+               function = "gpio";
        };
 };
 
@@ -105,7 +155,8 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x28>;
+       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cell-names = "mac-address";
 };
 
 &sdhci {
@@ -115,4 +166,16 @@
 
 &wmac {
        status = "okay";
+
+       mediatek,mtd-eeprom = <&factory 0x0>;
+};
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_28: macaddr@28 {
+               reg = <0x28 0x6>;
+       };
 };