From 38dcfe11a53bf7467858b1bae60e16754bf1869f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 10 Mar 2023 10:02:35 +0000 Subject: [PATCH] ARM: dts: Standardise on the upstream LED names Historically, downstream Pi DTS files have named the LEDs led0 and (if present) led1, while upstream have used the more meaningful "ACT" and "PWR". As part of a closer alignment with upstream, make the LED names match. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 3 +-- arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 1 - arch/arm/boot/dts/bcm2708-rpi-b.dts | 1 - arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 1 - arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 1 - arch/arm/boot/dts/bcm2708-rpi-zero.dts | 1 - arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 3 +-- arch/arm/boot/dts/bcm2709-rpi-cm2.dts | 1 - arch/arm/boot/dts/bcm2710-rpi-2-b.dts | 3 +-- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 3 +-- arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 3 +-- arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 1 - arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 1 - arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 -- arch/arm/boot/dts/bcm2711-rpi-400.dts | 2 -- arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 2 -- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 1 - 17 files changed, 5 insertions(+), 25 deletions(-) --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts @@ -157,14 +157,13 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 47 0>; }; pwr_led: led-pwr { - label = "led1"; + label = "PWR"; default-state = "off"; linux,default-trigger = "input"; gpios = <&gpio 35 0>; --- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts @@ -175,7 +175,6 @@ i2c_csi_dsi: &i2c1 { &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 16 1>; --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts @@ -157,7 +157,6 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 16 1>; --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi @@ -3,7 +3,6 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 47 0>; --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -213,7 +213,6 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "actpwr"; gpios = <&gpio 47 GPIO_ACTIVE_LOW>; --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -154,7 +154,6 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "actpwr"; gpios = <&gpio 47 GPIO_ACTIVE_LOW>; --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts @@ -157,14 +157,13 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 47 0>; }; pwr_led: led-pwr { - label = "led1"; + label = "PWR"; default-state = "off"; linux,default-trigger = "input"; gpios = <&gpio 35 0>; --- a/arch/arm/boot/dts/bcm2709-rpi-cm2.dts +++ b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts @@ -191,7 +191,6 @@ cam0_reg: &cam0_regulator { &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&virtgpio 0 0>; --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts @@ -157,14 +157,13 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 47 0>; }; pwr_led: led-pwr { - label = "led1"; + label = "PWR"; default-state = "off"; linux,default-trigger = "input"; gpios = <&gpio 35 0>; --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -233,14 +233,13 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 29 0>; }; pwr_led: led-pwr { - label = "led1"; + label = "PWR"; default-state = "off"; linux,default-trigger = "default-on"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -248,14 +248,13 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&virtgpio 0 0>; }; pwr_led: led-pwr { - label = "led1"; + label = "PWR"; default-state = "off"; linux,default-trigger = "input"; gpios = <&expgpio 7 0>; --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -190,7 +190,6 @@ cam0_reg: &cam0_regulator { &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&virtgpio 0 0>; --- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts @@ -226,7 +226,6 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "actpwr"; gpios = <&gpio 29 GPIO_ACTIVE_LOW>; --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -506,14 +506,12 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; pwr_led: led-pwr { - label = "led1"; default-state = "off"; linux,default-trigger = "default-on"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts @@ -513,14 +513,12 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "default-on"; gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; pwr_led: led-pwr { - label = "led1"; default-state = "off"; linux,default-trigger = "default-on"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -518,14 +518,12 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; pwr_led: led-pwr { - label = "led1"; default-state = "off"; linux,default-trigger = "default-on"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; --- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts @@ -388,7 +388,6 @@ &leds { act_led: led-act { - label = "led0"; default-state = "off"; linux,default-trigger = "mmc0"; };