| From 7749510c459c10c431d746a4749e7c9cf2899156 Mon Sep 17 00:00:00 2001 |
| From: Linus Walleij <linus.walleij@linaro.org> |
| Date: Sun, 13 Jun 2021 14:33:56 +0200 |
| Subject: ARM: dts: ux500: Fix LED probing |
| |
| From: Linus Walleij <linus.walleij@linaro.org> |
| |
| commit 7749510c459c10c431d746a4749e7c9cf2899156 upstream. |
| |
| The Ux500 HREF LEDs have not been probing properly for a |
| while as this was introduce: |
| |
| ret = of_property_read_u32(np, "color", &led_color); |
| if (ret) |
| return ret; |
| |
| Since the device tree did not define the new invented color |
| attribute, probe was failing. |
| |
| Define color attributes for the LEDs so they work again. |
| |
| Link: https://lore.kernel.org/r/20210613123356.880933-1-linus.walleij@linaro.org |
| Fixes: 92a81562e695 ("leds: lp55xx: Add multicolor framework support to lp55xx") |
| Cc: stable@vger.kernel.org |
| Cc: Dan Murphy <dmurphy@ti.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Olof Johansson <olof@lixom.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi |
| index 83b179692dff..13d216192904 100644 |
| --- a/arch/arm/boot/dts/ste-href.dtsi |
| +++ b/arch/arm/boot/dts/ste-href.dtsi |
| @@ -4,6 +4,7 @@ |
| */ |
| |
| #include <dt-bindings/interrupt-controller/irq.h> |
| +#include <dt-bindings/leds/common.h> |
| #include "ste-href-family-pinctrl.dtsi" |
| |
| / { |
| @@ -64,17 +65,20 @@ chan@0 { |
| reg = <0>; |
| led-cur = /bits/ 8 <0x2f>; |
| max-cur = /bits/ 8 <0x5f>; |
| + color = <LED_COLOR_ID_BLUE>; |
| linux,default-trigger = "heartbeat"; |
| }; |
| chan@1 { |
| reg = <1>; |
| led-cur = /bits/ 8 <0x2f>; |
| max-cur = /bits/ 8 <0x5f>; |
| + color = <LED_COLOR_ID_BLUE>; |
| }; |
| chan@2 { |
| reg = <2>; |
| led-cur = /bits/ 8 <0x2f>; |
| max-cur = /bits/ 8 <0x5f>; |
| + color = <LED_COLOR_ID_BLUE>; |
| }; |
| }; |
| lp5521@34 { |
| @@ -88,16 +92,19 @@ chan@0 { |
| reg = <0>; |
| led-cur = /bits/ 8 <0x2f>; |
| max-cur = /bits/ 8 <0x5f>; |
| + color = <LED_COLOR_ID_BLUE>; |
| }; |
| chan@1 { |
| reg = <1>; |
| led-cur = /bits/ 8 <0x2f>; |
| max-cur = /bits/ 8 <0x5f>; |
| + color = <LED_COLOR_ID_BLUE>; |
| }; |
| chan@2 { |
| reg = <2>; |
| led-cur = /bits/ 8 <0x2f>; |
| max-cur = /bits/ 8 <0x5f>; |
| + color = <LED_COLOR_ID_BLUE>; |
| }; |
| }; |
| bh1780@29 { |