ramips: remove redundant nvmem definitions

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_dlink_dir-1960-a1.dts

diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts
index ed8b188994f89a6da2162333bffb323fb314100d..d352d27b76c50a2c35900972507b75ce3ea740d7 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts
@@ -1,57 +1,29 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7621_dlink_dir-xx60-a1.dtsi"
 
 / {
        compatible = "dlink,dir-1960-a1", "mediatek,mt7621-soc";
        model = "D-Link DIR-1960 A1";
+};
 
-       aliases {
-               led-boot = &led_power_orange;
-               led-failsafe = &led_power_white;
-               led-running = &led_power_white;
-               led-upgrade = &led_net_orange;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led_power_orange: power_orange {
-                       label = "dir-1960-a1:orange:power";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-               };
-
-               led_power_white: power_white {
-                       label = "dir-1960-a1:white:power";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-               };
-
-               led_net_orange: net_orange {
-                       label = "dir-1960-a1:orange:net";
-                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-               };
-
-               net_white {
-                       label = "dir-1960-a1:white:net";
-                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
-               };
-
-               usb_white {
-                       label = "dir-1960-a1:white:usb";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       trigger-sources = <&xhci_ehci_port1>;
-                       linux,default-trigger = "usbport";
-               };
+&leds {
+       usb_white {
+               label = "white:usb";
+               gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+               trigger-sources = <&xhci_ehci_port1>;
+               linux,default-trigger = "usbport";
        };
 };
 
 &wifi0 {
-       mtd-mac-address = <&factory 0xe000>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <1>;
 };
 
 &wifi1 {
-       mtd-mac-address = <&factory 0xe000>;
-       mtd-mac-address-increment = <2>;
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <2>;
 };