ARM: dts: NSP: MX6X: correct LED function types

Currently, the amber LED will remain always on. This is due to a
misinterpretation of the LED sub-node properties, where-by "default-state"
was used to indicate the initial state when powering on the device. When in
use, however, this resulted in the amber LED always being on. Instead change
this to only indicate a fault state.

Assign LED_FUNCTION_POWER to the green PWM LED.

These changes bring the MX64/65 in line with the MR32's devicetree.

Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
index ba01054a76cfe7731e49436ad4ee27fc6adce5c9..58b7d9fc7574350bdeb5ca74acc130e9eb6452cd 100644 (file)
--- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
+++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
@@ -57,10 +57,9 @@
 
                led-4 {
                        /* amber:power */
-                       function = LED_FUNCTION_POWER;
+                       function = LED_FUNCTION_FAULT;
                        color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpioa 3 GPIO_ACTIVE_HIGH>;
-                       default-state = "on";
                };
 
                led-5 {

diff --git a/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
index 7c487c74fd102571c4b0c2be99790e9b684682a2..576cfc52567b3e4a92fa8caa14dc132bdb47c959 100644 (file)
--- a/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
+++ b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
@@ -106,10 +106,9 @@
 
                led-a {
                        /* amber:power */
-                       function = LED_FUNCTION_POWER;
+                       function = LED_FUNCTION_FAULT;
                        color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpioa 0 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
                };
 
                led-b {

diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
index 5de727de6a4b5622c12329dd56f2b4a0309d882f..b0854d881ac6801f048395a5325b198ceb24423e 100644 (file)
--- a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
+++ b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
@@ -22,7 +22,7 @@
                };
 
                led-2 {
-                       function = LED_FUNCTION_INDICATOR;
+                       function = LED_FUNCTION_POWER;
                        color = <LED_COLOR_ID_GREEN>;
                        pwms = <&pwm 2 50000>;
                        max-brightness = <255>;