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

[openwrt/staging/jow.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4019-gl-b2200.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
index e17609ff6fbfa9279dd21343a9bdbca9685f8744..9f645dd65739a90cc7ffea6b27bb12233b275ddc 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
@@ -3,6 +3,7 @@
 #include "qcom-ipq4019.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
@@ -84,7 +85,8 @@
                compatible = "gpio-leds";
 
                power_blue {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&tlmm 57 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
@@ -93,7 +95,8 @@
                        gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>;
                };
                power_white {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
                };
                internet_white {
@@ -185,20 +188,23 @@
                                label = "ART";
                                reg = <0x170000 0x10000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               precal_art_1000: precal@1000 {
-                                       reg = <0x1000 0x2f20>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               precal_art_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
-                               };
+                                       precal_art_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
+
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
 
-                               precal_art_9000: precal@9000 {
-                                       reg = <0x9000 0x2f20>;
+                                       precal_art_9000: precal@9000 {
+                                               reg = <0x9000 0x2f20>;
+                                       };
                                };
                        };
                };
@@ -211,7 +217,7 @@
        status = "okay";
 
        spidev1: spi@0 {
-               compatible = "siliconlabs,si3210";
+               compatible = "silabs,si3210";
                reg = <0>;
                spi-max-frequency = <24000000>;
        };