ramips: clean up useless dts partition labels

[openwrt/staging/jow.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 af3a1b1a1e978b20c01af0fb76f522bb6f5a9625..de3b7d625ef430498d2119eef869fadd1e05b374 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
+++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
@@ -17,28 +17,22 @@
                bootargs = "console=ttyS0,115200";
        };
 
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x8000000>;
-       };
-
        leds {
                compatible = "gpio-leds";
 
                led_wifi: wifi {
-                       label = "widora:orange:wifi";
+                       label = "orange:wifi";
                        gpios = <&wgpio 0 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                wps {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -52,47 +46,109 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "gpio";
-                       ralink,function = "gpio";
-               };
+&spi0 {
+       status = "okay";
 
-               perst {
-                       ralink,group = "perst";
-                       ralink,function = "gpio";
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
+
+       flash0: 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>;
+                       };
+
+                       partition@40000 {
+                               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>;
+                                       };
+
+                                       macaddr_factory_28: macaddr@28 {
+                                               reg = <0x28 0x6>;
+                                       };
+                               };
+                       };
+
+                       firmware: partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               /* reg property is set based on flash size in DTS files */
+                       };
                };
+       };
 
-               refclk {
-                       ralink,group = "refclk";
-                       ralink,function = "gpio";
-               };
+       spidev@1 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "linux,spidev";
+               reg = <1>;
+               spi-max-frequency = <40000000>;
+       };
+};
 
-               i2s {
-                       ralink,group = "i2s";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "gpio";
+               function = "gpio";
+       };
 
-               spis {
-                       ralink,group = "spis";
-                       ralink,function = "gpio";
-               };
+       perst {
+               groups = "perst";
+               function = "gpio";
+       };
 
-               wled_kn {
-                       ralink,group = "wled_kn";
-                       ralink,function = "gpio";
-               };
+       refclk {
+               groups = "refclk";
+               function = "gpio";
+       };
 
-               wled_an {
-                       ralink,group = "wled_an";
-                       ralink,function = "wled_an";
-               };
+       i2s {
+               groups = "i2s";
+               function = "gpio";
+       };
 
-               wdt {
-                       ralink,group = "wdt";
-                       ralink,function = "gpio";
-               };
+       spis {
+               groups = "spis";
+               function = "gpio";
+       };
+
+       wled_kn {
+               groups = "wled_kn";
+               function = "gpio";
+       };
+
+       wled_an {
+               groups = "wled_an";
+               function = "wled_an";
+       };
+
+       wdt {
+               groups = "wdt";
+               function = "gpio";
        };
 };
 
@@ -113,7 +169,8 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x28>;
+       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cell-names = "mac-address";
 };
 
 &sdhci {
@@ -123,4 +180,7 @@
 
 &wmac {
        status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };