arm64: dts: imx8-apalis: Fix LEDs name collision

Ixora boards have multiple instances of status leds, to avoid a name
collision add the function-enumerator property.

This fixes the following Linux kernel warnings:

  leds-gpio leds: Led green:status renamed to green:status_1 due to name collision
  leds-gpio leds: Led red:status renamed to red:status_1 due to name collision

Fixes: c083131c9021 ("arm64: dts: freescale: add apalis imx8 aka quadmax carrier board support")
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi
index 2677bc761b39dedde90985eda87dc8d348ce67e1..93f485140b20c708101514bf2789d77734e2f9c3 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi
@@ -21,6 +21,7 @@
                        color = <LED_COLOR_ID_GREEN>;
                        default-state = "off";
                        function = LED_FUNCTION_STATUS;
+                       function-enumerator = <1>;
                        gpios = <&lsio_gpio5 27 GPIO_ACTIVE_HIGH>;
                };
 
@@ -29,6 +30,7 @@
                        color = <LED_COLOR_ID_RED>;
                        default-state = "off";
                        function = LED_FUNCTION_STATUS;
+                       function-enumerator = <1>;
                        gpios = <&lsio_gpio5 29 GPIO_ACTIVE_HIGH>;
                };
 
@@ -37,6 +39,7 @@
                        color = <LED_COLOR_ID_GREEN>;
                        default-state = "off";
                        function = LED_FUNCTION_STATUS;
+                       function-enumerator = <2>;
                        gpios = <&lsio_gpio5 20 GPIO_ACTIVE_HIGH>;
                };
 
@@ -45,6 +48,7 @@
                        color = <LED_COLOR_ID_RED>;
                        default-state = "off";
                        function = LED_FUNCTION_STATUS;
+                       function-enumerator = <2>;
                        gpios = <&lsio_gpio5 21 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi
index 268d5167e9486f546652c6c50731169ca0a506b3..5c86bcee55fb76e536ec92746cef217e21c815a8 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi
@@ -21,6 +21,7 @@
                        color = <LED_COLOR_ID_GREEN>;
                        default-state = "off";
                        function = LED_FUNCTION_STATUS;
+                       function-enumerator = <1>;
                        gpios = <&lsio_gpio5 27 GPIO_ACTIVE_HIGH>;
                };
 
@@ -29,6 +30,7 @@
                        color = <LED_COLOR_ID_RED>;
                        default-state = "off";
                        function = LED_FUNCTION_STATUS;
+                       function-enumerator = <1>;
                        gpios = <&lsio_gpio5 29 GPIO_ACTIVE_HIGH>;
                };
 
@@ -37,6 +39,7 @@
                        color = <LED_COLOR_ID_GREEN>;
                        default-state = "off";
                        function = LED_FUNCTION_STATUS;
+                       function-enumerator = <2>;
                        gpios = <&lsio_gpio5 20 GPIO_ACTIVE_HIGH>;
                };
 
@@ -45,6 +48,7 @@
                        color = <LED_COLOR_ID_RED>;
                        default-state = "off";
                        function = LED_FUNCTION_STATUS;
+                       function-enumerator = <2>;
                        gpios = <&lsio_gpio5 21 GPIO_ACTIVE_HIGH>;
                };
        };