ramips: convert to new LED color/function format where possible

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7628an_mercury_mac1200r-v2.dts

diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
index 4a05264d7f2bf3b7889ed2c9965c9adeeedbe122..f520305322a6860a1660ff258bc4c93afba29357 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "mt7628an.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "mercury,mac1200r-v2", "mediatek,mt7628an-soc";
@@ -16,15 +15,12 @@
                led-upgrade = &led_status;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "mac1200rv2:green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };
@@ -52,12 +48,36 @@
                                label = "factory_info";
                                reg = <0x1d800 0x800>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       macaddr_factory_d: macaddr@d {
+                                               reg = <0xd 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@1e000 {
                                label = "art";
                                reg = <0x1e000 0x2000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_art_1000: eeprom@1000 {
+                                               reg = <0x1000 0x200>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -81,7 +101,8 @@
 
 &ethernet {
        pinctrl-names = "default";
-       mtd-mac-address = <&factory 0xd>;
+       nvmem-cells = <&macaddr_factory_d>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -90,7 +111,9 @@
 
 &wmac {
        status = "okay";
-       ralink,mtd-eeprom = <&art 0x0>;
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &pcie {
@@ -100,7 +123,8 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&art 0x1000>;
+               nvmem-cells = <&eeprom_art_1000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };