projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 908e654)
ARM: dts: omap3-echo: Update LED configuration
authorAndré Hentschel <nerv@dawncrow.de>
Sat, 30 Jan 2021 12:25:13 +0000 (13:25 +0100)
committerTony Lindgren <tony@atomide.com>
Wed, 24 Mar 2021 16:31:08 +0000 (18:31 +0200)
Update LED configuration.

Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/omap3-echo.dts patch | blob | history

diff --git a/arch/arm/boot/dts/omap3-echo.dts b/arch/arm/boot/dts/omap3-echo.dts
index b9fd113979f25e875966bea0077c7b3d0cab2fed..3382480d5f1939cfd163c8ad07329a83a8022213 100644 (file)
--- a/arch/arm/boot/dts/omap3-echo.dts
+++ b/arch/arm/boot/dts/omap3-echo.dts
@@ -7,6 +7,7 @@
 #include "dm3725.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Amazon Echo (first generation)";
@@ -139,179 +140,367 @@
        clock-frequency = <400000>;
 
        lp5523A: lp5523A@32 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "national,lp5523";
                label = "q1";
                reg = <0x32>;
                clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
                enable-gpio = <&gpio4 13 GPIO_ACTIVE_HIGH>; /* GPIO_109 */
 
-               chan0 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan1 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan2 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan3 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan4 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan5 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan6 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan7 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan8 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
+               multi-led@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@0 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x0>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@1 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x1>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@6 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x6>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
+               };
+               multi-led@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x1>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@2 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x2>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@3 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x3>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@7 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x7>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
+               };
+               multi-led@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x2>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@4 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x4>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@5 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x5>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@8 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x8>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
                };
        };
 
        lp5523B: lp5523B@33 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "national,lp5523";
                label = "q3";
                reg = <0x33>;
                clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
 
-               chan0 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan1 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan2 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan3 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan4 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan5 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan6 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan7 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan8 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
+               multi-led@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@0 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x0>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@1 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x1>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@6 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x6>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
+               };
+               multi-led@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x1>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@2 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x2>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@3 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x3>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@7 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x7>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
+               };
+               multi-led@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x2>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@4 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x4>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@5 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x5>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@8 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x8>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
                };
        };
 
        lp5523C: lp5523C@34 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "national,lp5523";
                label = "q4";
                reg = <0x34>;
                clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
 
-               chan0 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan1 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan2 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan3 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan4 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan5 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan6 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan7 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan8 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
+               multi-led@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@0 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x0>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@1 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x1>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@6 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x6>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
+               };
+               multi-led@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x1>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@2 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x2>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@3 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x3>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@7 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x7>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
+               };
+               multi-led@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x2>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@4 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x4>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@5 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x5>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@8 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x8>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
                };
        };
 
        lp5523D: lp552D@35 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "national,lp5523";
                label = "q2";
                reg = <0x35>;
                clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
 
-               chan0 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan1 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan2 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan3 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan4 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan5 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan6 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan7 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
-               };
-               chan8 {
-                       led-cur = /bits/ 8 <12>;
-                       max-cur = /bits/ 8 <15>;
+               multi-led@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@0 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x0>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@1 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x1>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@6 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x6>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
+               };
+               multi-led@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x1>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@2 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x2>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@3 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x3>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@7 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x7>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
+               };
+               multi-led@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x2>;
+                       color = <LED_COLOR_ID_RGB>;
+
+                       led@4 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x4>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
+
+                       led@5 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x5>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
+
+                       led@8 {
+                               led-cur = /bits/ 8 <12>;
+                               max-cur = /bits/ 8 <15>;
+                               reg = <0x8>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
                };
        };
 };
ep93xx device tree rework repo: git://git.maquefel.me/linux.git