ARM: dts: imx6ul: segin: Fix LED naming for phyCORE and PEB-EVAL-01

Fix node name for the user LEDs to prevent the pinctrl of the phyCORE's
leds node from being overwritten. Also use more generic names for user
LEDs.

Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
index 1b745582911c7a95698be227bc7e376d80e2ee19..73266b4a889b76a02727aa348e40ca903cc48463 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
@@ -31,8 +31,7 @@ gpio_leds_som: leds {
                pinctrl-0 = <&pinctrl_gpioleds_som>;
                compatible = "gpio-leds";
 
-               led_green {
-                       label = "phycore:green";
+               phycore-green {
                        gpios = <&gpio5 4 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };

diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi
index e2f38f39a6ad47b0cd80d3a9fdaf26fe0e1b5dc2..2f3fd32a116795ada43a78d967704fa988f7ba3a 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi
@@ -21,20 +21,22 @@ power {
                };
        };
 
-       user_leds: leds {
+       user_leds: user-leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_user_leds>;
                status = "disabled";
 
-               led_yellow {
-                       gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "default-on";
+               user-led1 {
+                       gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "gpio";
+                       default-state = "on";
                };
 
-               led_red {
-                       gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "default-on";
+               user-led2 {
+                       gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "gpio";
+                       default-state = "on";
                };
        };
 };