ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7628an_xiaomi_miwifi-nano.dts

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
index 347ce6489c42cf1aa95244820914c49114955791..889e725df5c77a66764e79cf63f41efd329b02d7 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
@@ -1,19 +1,19 @@
-/dts-v1/;
-
 #include "mt7628an.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "xiaomi,miwifi-nano", "mediatek,mt7628an-soc";
-       model = "MiWiFi Nano";
+       model = "Xiaomi MiWiFi Nano";
 
        aliases {
-               led-boot = &led_blue;
-               led-failsafe = &led_blue;
-               led-running = &led_blue;
-               led-upgrade = &led_blue;
+               led-boot = &led_status_amber;
+               led-failsafe = &led_status_red;
+               led-running = &led_status_blue;
+               led-upgrade = &led_status_amber;
+               label-mac-device = &ethernet;
        };
 
        chosen {
@@ -23,38 +23,40 @@
        leds {
                compatible = "gpio-leds";
 
-               led_blue: status_blue {
-                       label = "miwifi-nano:blue:status";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+               led_status_blue: status_blue {
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
-               status_red {
-                       label = "miwifi-nano:red:status";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+
+               led_status_red: status_red {
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
-               status_amber {
-                       label = "miwifi-nano:amber:status";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+
+               led_status_amber: status_amber {
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_AMBER>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "gpio", "refclk", "wdt", "wled_an";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "gpio", "refclk", "wdt", "wled_an";
+               function = "gpio";
        };
 };
 
@@ -66,19 +68,27 @@
        status = "disabled";
 };
 
+&esw {
+       mediatek,portmap = <0x2f>;
+       mediatek,portdisable = <0x2a>;
+};
+
 &wmac {
        status = "okay";
-       ralink,mtd-eeprom = <&factory 0x4>;
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x28>;
+       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cell-names = "mac-address";
 };
 
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <40000000>;
@@ -99,10 +109,24 @@
                                reg = <0x30000 0x10000>;
                        };
 
-                       factory: partition@40000 {
+                       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>;
+                                       };
+                               };
                        };
 
                        partition@50000 {