ARM: dts: imx6dl-yapp4: Model the RGB LED as a single multi-led part

Describe the RGB LED indicator according to the reality - it is a single
part containing all the three R,G and B LEDs in one package.
With this description the chan-name property becomes useless, remove it.

Signed-off-by: Michal Vokáč <michal.vokac@ysoft.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-common.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-common.dtsi
index 8bc6376d0dc102bf585f9407f5669199a160e9f0..4a5736526927cf73fcbd223af0c700fe4ee1b783 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-common.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-common.dtsi
@@ -279,28 +279,32 @@
                #size-cells = <0>;
                status = "disabled";
 
-               led@0 {
-                       chan-name = "R";
-                       led-cur = /bits/ 8 <0x20>;
-                       max-cur = /bits/ 8 <0x60>;
-                       reg = <0>;
-                       color = <LED_COLOR_ID_RED>;
-               };
+               multi-led@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       color = <LED_COLOR_ID_RGB>;
+                       function = LED_FUNCTION_INDICATOR;
+
+                       led@0 {
+                               led-cur = /bits/ 8 <0x20>;
+                               max-cur = /bits/ 8 <0x60>;
+                               reg = <0>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
 
-               led@1 {
-                       chan-name = "G";
-                       led-cur = /bits/ 8 <0x20>;
-                       max-cur = /bits/ 8 <0x60>;
-                       reg = <1>;
-                       color = <LED_COLOR_ID_GREEN>;
-               };
+                       led@1 {
+                               led-cur = /bits/ 8 <0x20>;
+                               max-cur = /bits/ 8 <0x60>;
+                               reg = <1>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
 
-               led@2 {
-                       chan-name = "B";
-                       led-cur = /bits/ 8 <0x20>;
-                       max-cur = /bits/ 8 <0x60>;
-                       reg = <2>;
-                       color = <LED_COLOR_ID_BLUE>;
+                       led@2 {
+                               led-cur = /bits/ 8 <0x20>;
+                               max-cur = /bits/ 8 <0x60>;
+                               reg = <2>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
                };
        };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi
index 6f9bd163ffbe155cb779e163bae0118866053d4d..6e49e1ccf6fc32320f7c5fd9c740cf6fb7044a0b 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi
@@ -278,28 +278,32 @@
                #size-cells = <0>;
                status = "disabled";
 
-               led@0 {
-                       chan-name = "R";
-                       led-cur = /bits/ 8 <0x6e>;
-                       max-cur = /bits/ 8 <0xc8>;
-                       reg = <0>;
-                       color = <LED_COLOR_ID_RED>;
-               };
+               multi-led@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       color = <LED_COLOR_ID_RGB>;
+                       function = LED_FUNCTION_INDICATOR;
+
+                       led@0 {
+                               led-cur = /bits/ 8 <0x6e>;
+                               max-cur = /bits/ 8 <0xc8>;
+                               reg = <0>;
+                               color = <LED_COLOR_ID_RED>;
+                       };
 
-               led@1 {
-                       chan-name = "G";
-                       led-cur = /bits/ 8 <0xbe>;
-                       max-cur = /bits/ 8 <0xc8>;
-                       reg = <1>;
-                       color = <LED_COLOR_ID_GREEN>;
-               };
+                       led@1 {
+                               led-cur = /bits/ 8 <0xbe>;
+                               max-cur = /bits/ 8 <0xc8>;
+                               reg = <1>;
+                               color = <LED_COLOR_ID_GREEN>;
+                       };
 
-               led@2 {
-                       chan-name = "B";
-                       led-cur = /bits/ 8 <0xbe>;
-                       max-cur = /bits/ 8 <0xc8>;
-                       reg = <2>;
-                       color = <LED_COLOR_ID_BLUE>;
+                       led@2 {
+                               led-cur = /bits/ 8 <0xbe>;
+                               max-cur = /bits/ 8 <0xc8>;
+                               reg = <2>;
+                               color = <LED_COLOR_ID_BLUE>;
+                       };
                };
        };