ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7620a_netgear_ex2700.dts

diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts b/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts
index 5db2a7ae9ccb81c115970a6912e18574b9f07b1d..c39984dbf9fd35b0727478f7c97e05dc3bacde04 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts
+++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts
@@ -1,19 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Device Tree file for the Netgear EX2700
- *
  * Copyright (C) 2016 Joseph C. Lehner <joseph.c.lehner@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "netgear,ex2700", "ralink,mt7620a-soc";
@@ -26,69 +20,64 @@
                led-upgrade = &led_power_green;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
+       keys {
+               compatible = "gpio-keys";
+
+               reset {
+                       label = "reset";
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
+               };
+
+               wps {
+                       label = "wps";
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
+               };
        };
 
        leds {
                compatible = "gpio-leds";
 
                led_power_green: power_g {
-                       label = "ex2700:green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                power_r {
-                       label = "ex2700:red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
 
                device_g {
-                       label = "ex2700:green:device";
+                       label = "green:device";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
 
                device_r {
-                       label = "ex2700:red:device";
+                       label = "red:device";
                        gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                };
 
                router_g {
-                       label = "ex2700:green:router";
+                       label = "green:router";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
 
                router_r {
-                       label = "ex2700:red:router";
+                       label = "red:router";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "ex2700:green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
        };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-};
-
-&gpio0 {
-       status = "okay";
 };
 
 &gpio1 {
@@ -98,7 +87,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -126,29 +115,46 @@
                                reg = <0x40000 0x3b0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       eeprom_art_1000: eeprom@1000 {
+                                               reg = <0x1000 0x200>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
-       mtd-mac-address = <&art 0x6>;
-       ralink,mtd-eeprom = <&art 0x1000>;
+       nvmem-cells = <&eeprom_art_1000>, <&macaddr_art_6>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               default {
-                       ralink,group = "i2c", "uartf", "spi refclk";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       default {
+               groups = "i2c", "uartf", "spi refclk";
+               function = "gpio";
        };
 };