ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7620a_dlink_dwr-118-a1.dts

diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
index 707bc1c3d3d248b07e04b6b223f6dda467465be4..978de470f0a1827b783760e5565d9befef126596 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        compatible = "dlink,dwr-118-a1", "ralink,mt7620a-soc";
@@ -17,8 +18,7 @@
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                wps {
                        label = "wps";
@@ -37,27 +37,30 @@
                compatible = "gpio-leds";
 
                wan {
-                       label = "dwr-118-a1:green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
 
                led_internet: internet {
-                       label = "dwr-118-a1:green:internet";
+                       label = "green:internet";
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "dwr-118-a1:green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "dwr-118-a1:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "dwr-118-a1:green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
@@ -108,15 +111,33 @@
                        };
 
                        partition@10000 {
-                               compatible = "amit,jimage";
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,ih-magic = <IH_MAGIC_OKLI>;
+                               openwrt,offset = <0x10000>;
                                label = "firmware";
                                reg = <0x10000 0xfe0000>;
                        };
 
-                       config: partition@ff0000 {
+                       partition@ff0000 {
                                label = "config";
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_config_e083: eeprom@e083 {
+                                               reg = <0xe083 0x200>;
+                                       };
+
+                                       macaddr_config_e496: macaddr@e496 {
+                                               compatible = "mac-base";
+                                               reg = <0xe496 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -130,12 +151,10 @@
        status = "okay";
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               default {
-                       ralink,group = "ephy", "uartf", "spi refclk", "wled";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       default {
+               groups = "ephy", "uartf", "spi refclk", "wled";
+               function = "gpio";
        };
 };
 
@@ -146,9 +165,8 @@
 &pcie0 {
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&config 0xe496>;
-               mtd-mac-address-increment = <(2)>;
-               mediatek,mtd-eeprom = <&config 0xe083>;
+               nvmem-cells = <&eeprom_config_e083>, <&macaddr_config_e496 2>;
+               nvmem-cell-names = "eeprom", "mac-address";
 
                led {
                        led-sources = <0>;
@@ -158,7 +176,6 @@
 };
 
 &ethernet {
-       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 
@@ -190,5 +207,6 @@
 };
 
 &gsw {
-       mediatek,port4 = "gmac";
+       mediatek,port4-gmac;
+       mediatek,ephy-base = /bits/ 8 <8>;
 };