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

[openwrt/staging/jow.git] / target / linux / mvebu / files / arch / arm64 / boot / dts / marvell / armada-3720-gl-mv1000.dts

diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
index acf15e8ca96d446ae5a61f8daca3bb8e37acfea5..07400fce3ae33642e46af25ef2fd325cedd023c7 100644 (file)
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
@@ -3,6 +3,7 @@
 /dts-v1/;
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include "armada-372x.dtsi"
 
 / {
@@ -63,12 +64,14 @@
                };
 
                wan {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
@@ -96,7 +99,7 @@
 
                        partition@f0000 {
                                label = "u-boot-env";
-                               reg = <0Xf0000 0x8000>;
+                               reg = <0xf0000 0x8000>;
                                read-only;
                        };
 
@@ -104,6 +107,38 @@
                                label = "factory";
                                reg = <0xf8000 0x8000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_factory_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
+                       };
+
+                       partition@100000 {
+                               label = "gl-firmware-dtb";
+                               reg = <0x100000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@110000 {
+                               label = "gl-firmware";
+                               reg = <0x110000 0xef0000>;
+                               read-only;
+                       };
+
+                       partition@ef0000 {
+                               label = "gl-firmware-jffs2";
+                               reg = <0xef0000 0x110000>;
+                               read-only;
                        };
                };
        };
@@ -157,7 +192,6 @@
 
                        port@0 {
                                reg = <0>;
-                               label = "cpu";
                                ethernet = <&eth0>;
                        };
 
@@ -214,17 +248,3 @@
                full-duplex;
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_factory_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};