target/linux/bcm27xx/patches-6.1/950-0584-ARM-dts-Standardise-on-the-upstream-LED-names.patch

   1 From 38dcfe11a53bf7467858b1bae60e16754bf1869f Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Fri, 10 Mar 2023 10:02:35 +0000
   4 Subject: [PATCH] ARM: dts: Standardise on the upstream LED names
   5
   6 Historically, downstream Pi DTS files have named the LEDs led0 and (if
   7 present) led1, while upstream have used the more meaningful "ACT" and
   8 "PWR". As part of a closer alignment with upstream, make the LED names
   9 match.
  10
  11 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  12 ---
  13  arch/arm/boot/dts/bcm2708-rpi-b-plus.dts   | 3 +--
  14  arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts   | 1 -
  15  arch/arm/boot/dts/bcm2708-rpi-b.dts        | 1 -
  16  arch/arm/boot/dts/bcm2708-rpi-cm.dtsi      | 1 -
  17  arch/arm/boot/dts/bcm2708-rpi-zero-w.dts   | 1 -
  18  arch/arm/boot/dts/bcm2708-rpi-zero.dts     | 1 -
  19  arch/arm/boot/dts/bcm2709-rpi-2-b.dts      | 3 +--
  20  arch/arm/boot/dts/bcm2709-rpi-cm2.dts      | 1 -
  21  arch/arm/boot/dts/bcm2710-rpi-2-b.dts      | 3 +--
  22  arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 3 +--
  23  arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 3 +--
  24  arch/arm/boot/dts/bcm2710-rpi-cm3.dts      | 1 -
  25  arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 1 -
  26  arch/arm/boot/dts/bcm2711-rpi-4-b.dts      | 2 --
  27  arch/arm/boot/dts/bcm2711-rpi-400.dts      | 2 --
  28  arch/arm/boot/dts/bcm2711-rpi-cm4.dts      | 2 --
  29  arch/arm/boot/dts/bcm2711-rpi-cm4s.dts     | 1 -
  30  17 files changed, 5 insertions(+), 25 deletions(-)
  31
  32 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  33 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  34 @@ -157,14 +157,13 @@
  35
  36  &leds {
  37         act_led: led-act {
  38 -               label = "led0";
  39                 default-state = "off";
  40                 linux,default-trigger = "mmc0";
  41                 gpios = <&gpio 47 0>;
  42         };
  43
  44         pwr_led: led-pwr {
  45 -               label = "led1";
  46 +               label = "PWR";
  47                 default-state = "off";
  48                 linux,default-trigger = "input";
  49                 gpios = <&gpio 35 0>;
  50 --- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
  51 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
  52 @@ -175,7 +175,6 @@ i2c_csi_dsi: &i2c1 {
  53
  54  &leds {
  55         act_led: led-act {
  56 -               label = "led0";
  57                 default-state = "off";
  58                 linux,default-trigger = "mmc0";
  59                 gpios = <&gpio 16 1>;
  60 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
  61 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  62 @@ -157,7 +157,6 @@
  63
  64  &leds {
  65         act_led: led-act {
  66 -               label = "led0";
  67                 default-state = "off";
  68                 linux,default-trigger = "mmc0";
  69                 gpios = <&gpio 16 1>;
  70 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
  71 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
  72 @@ -3,7 +3,6 @@
  73
  74  &leds {
  75         act_led: led-act {
  76 -               label = "led0";
  77                 default-state = "off";
  78                 linux,default-trigger = "mmc0";
  79                 gpios = <&gpio 47 0>;
  80 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  81 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  82 @@ -213,7 +213,6 @@
  83
  84  &leds {
  85         act_led: led-act {
  86 -               label = "led0";
  87                 default-state = "off";
  88                 linux,default-trigger = "actpwr";
  89                 gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
  90 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  91 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  92 @@ -154,7 +154,6 @@
  93
  94  &leds {
  95         act_led: led-act {
  96 -               label = "led0";
  97                 default-state = "off";
  98                 linux,default-trigger = "actpwr";
  99                 gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 100 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 101 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 102 @@ -157,14 +157,13 @@
 103
 104  &leds {
 105         act_led: led-act {
 106 -               label = "led0";
 107                 default-state = "off";
 108                 linux,default-trigger = "mmc0";
 109                 gpios = <&gpio 47 0>;
 110         };
 111
 112         pwr_led: led-pwr {
 113 -               label = "led1";
 114 +               label = "PWR";
 115                 default-state = "off";
 116                 linux,default-trigger = "input";
 117                 gpios = <&gpio 35 0>;
 118 --- a/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
 119 +++ b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
 120 @@ -191,7 +191,6 @@ cam0_reg: &cam0_regulator {
 121
 122  &leds {
 123         act_led: led-act {
 124 -               label = "led0";
 125                 default-state = "off";
 126                 linux,default-trigger = "mmc0";
 127                 gpios = <&virtgpio 0 0>;
 128 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 129 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 130 @@ -157,14 +157,13 @@
 131
 132  &leds {
 133         act_led: led-act {
 134 -               label = "led0";
 135                 default-state = "off";
 136                 linux,default-trigger = "mmc0";
 137                 gpios = <&gpio 47 0>;
 138         };
 139
 140         pwr_led: led-pwr {
 141 -               label = "led1";
 142 +               label = "PWR";
 143                 default-state = "off";
 144                 linux,default-trigger = "input";
 145                 gpios = <&gpio 35 0>;
 146 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 147 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 148 @@ -233,14 +233,13 @@
 149
 150  &leds {
 151         act_led: led-act {
 152 -               label = "led0";
 153                 default-state = "off";
 154                 linux,default-trigger = "mmc0";
 155                 gpios = <&gpio 29 0>;
 156         };
 157
 158         pwr_led: led-pwr {
 159 -               label = "led1";
 160 +               label = "PWR";
 161                 default-state = "off";
 162                 linux,default-trigger = "default-on";
 163                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 164 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 165 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 166 @@ -248,14 +248,13 @@
 167
 168  &leds {
 169         act_led: led-act {
 170 -               label = "led0";
 171                 default-state = "off";
 172                 linux,default-trigger = "mmc0";
 173                 gpios = <&virtgpio 0 0>;
 174         };
 175
 176         pwr_led: led-pwr {
 177 -               label = "led1";
 178 +               label = "PWR";
 179                 default-state = "off";
 180                 linux,default-trigger = "input";
 181                 gpios = <&expgpio 7 0>;
 182 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 183 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 184 @@ -190,7 +190,6 @@ cam0_reg: &cam0_regulator {
 185
 186  &leds {
 187         act_led: led-act {
 188 -               label = "led0";
 189                 default-state = "off";
 190                 linux,default-trigger = "mmc0";
 191                 gpios = <&virtgpio 0 0>;
 192 --- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
 193 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
 194 @@ -226,7 +226,6 @@
 195
 196  &leds {
 197         act_led: led-act {
 198 -               label = "led0";
 199                 default-state = "off";
 200                 linux,default-trigger = "actpwr";
 201                 gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 202 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 203 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 204 @@ -506,14 +506,12 @@
 205
 206  &leds {
 207         act_led: led-act {
 208 -               label = "led0";
 209                 default-state = "off";
 210                 linux,default-trigger = "mmc0";
 211                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 212         };
 213
 214         pwr_led: led-pwr {
 215 -               label = "led1";
 216                 default-state = "off";
 217                 linux,default-trigger = "default-on";
 218                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 219 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
 220 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
 221 @@ -513,14 +513,12 @@
 222
 223  &leds {
 224         act_led: led-act {
 225 -               label = "led0";
 226                 default-state = "off";
 227                 linux,default-trigger = "default-on";
 228                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 229         };
 230
 231         pwr_led: led-pwr {
 232 -               label = "led1";
 233                 default-state = "off";
 234                 linux,default-trigger = "default-on";
 235                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 236 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 237 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 238 @@ -518,14 +518,12 @@
 239
 240  &leds {
 241         act_led: led-act {
 242 -               label = "led0";
 243                 default-state = "off";
 244                 linux,default-trigger = "mmc0";
 245                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 246         };
 247
 248         pwr_led: led-pwr {
 249 -               label = "led1";
 250                 default-state = "off";
 251                 linux,default-trigger = "default-on";
 252                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 253 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
 254 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
 255 @@ -388,7 +388,6 @@
 256
 257  &leds {
 258         act_led: led-act {
 259 -               label = "led0";
 260                 default-state = "off";
 261                 linux,default-trigger = "mmc0";
 262         };