Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stefan Riedmueller and committed by
Shawn Guo
783c10aa 45826415

+10 -9
+1 -2
arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
··· 31 31 pinctrl-0 = <&pinctrl_gpioleds_som>; 32 32 compatible = "gpio-leds"; 33 33 34 - led_green { 35 - label = "phycore:green"; 34 + phycore-green { 36 35 gpios = <&gpio5 4 GPIO_ACTIVE_HIGH>; 37 36 linux,default-trigger = "heartbeat"; 38 37 };
+9 -7
arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi
··· 21 21 }; 22 22 }; 23 23 24 - user_leds: leds { 24 + user_leds: user-leds { 25 25 compatible = "gpio-leds"; 26 26 pinctrl-names = "default"; 27 27 pinctrl-0 = <&pinctrl_user_leds>; 28 28 status = "disabled"; 29 29 30 - led_yellow { 31 - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; 32 - linux,default-trigger = "default-on"; 30 + user-led1 { 31 + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; 32 + linux,default-trigger = "gpio"; 33 + default-state = "on"; 33 34 }; 34 35 35 - led_red { 36 - gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; 37 - linux,default-trigger = "default-on"; 36 + user-led2 { 37 + gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; 38 + linux,default-trigger = "gpio"; 39 + default-state = "on"; 38 40 }; 39 41 }; 40 42 };