target/linux/bcm27xx/patches-6.1/950-0554-ARM-dts-Set-the-LED-default-state-to-off.patch

   1 From 808b5ec5bddc978f7dcb3e7afafd959503213b1c Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Tue, 24 Jan 2023 16:54:16 +0000
   4 Subject: [PATCH] ARM: dts: Set the LED default-state to "off"
   5
   6 The default-state property for an LED determines the state of the LED
   7 when its trigger is set to "none". Many users expect that specifying a
   8 trigger of "none" means that the LED will be off, and there is a logic
   9 to that assumption, but the current default of "keep" makes the
  10 assumption false.
  11
  12 Given that no Pi models have a default-trigger of "none", changing the
  13 default-state should have no visible impact for most people, but doing
  14 so will permit a more obvious and more consistent way of turning off
  15 the LEDs.
  16
  17 Note that 6.2 included an upstream DT reorganisation that required some
  18 downstream changes, and while doing that I changed the default states.
  19 This commit brings rpi-6.1.y into line with rpi-6.2.y.
  20
  21 See: https://github.com/raspberrypi/firmware/issues/1742
  22
  23 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  24 ---
  25  arch/arm/boot/dts/bcm2708-rpi-b-plus.dts   | 2 ++
  26  arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts   | 1 +
  27  arch/arm/boot/dts/bcm2708-rpi-b.dts        | 1 +
  28  arch/arm/boot/dts/bcm2708-rpi-cm.dtsi      | 1 +
  29  arch/arm/boot/dts/bcm2708-rpi-zero-w.dts   | 1 +
  30  arch/arm/boot/dts/bcm2708-rpi-zero.dts     | 1 +
  31  arch/arm/boot/dts/bcm2709-rpi-2-b.dts      | 2 ++
  32  arch/arm/boot/dts/bcm2709-rpi-cm2.dts      | 1 +
  33  arch/arm/boot/dts/bcm2710-rpi-2-b.dts      | 2 ++
  34  arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 2 ++
  35  arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 2 ++
  36  arch/arm/boot/dts/bcm2710-rpi-cm3.dts      | 1 +
  37  arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 1 +
  38  arch/arm/boot/dts/bcm2711-rpi-4-b.dts      | 2 ++
  39  arch/arm/boot/dts/bcm2711-rpi-400.dts      | 3 ++-
  40  arch/arm/boot/dts/bcm2711-rpi-cm4.dts      | 2 ++
  41  arch/arm/boot/dts/bcm2711-rpi-cm4s.dts     | 1 +
  42  17 files changed, 25 insertions(+), 1 deletion(-)
  43
  44 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  45 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  46 @@ -158,12 +158,14 @@
  47  &leds {
  48         act_led: led-act {
  49                 label = "led0";
  50 +               default-state = "off";
  51                 linux,default-trigger = "mmc0";
  52                 gpios = <&gpio 47 0>;
  53         };
  54
  55         pwr_led: led-pwr {
  56                 label = "led1";
  57 +               default-state = "off";
  58                 linux,default-trigger = "input";
  59                 gpios = <&gpio 35 0>;
  60         };
  61 --- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
  62 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
  63 @@ -176,6 +176,7 @@ i2c_csi_dsi: &i2c1 {
  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         };
  71 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
  72 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  73 @@ -158,6 +158,7 @@
  74  &leds {
  75         act_led: led-act {
  76                 label = "led0";
  77 +               default-state = "off";
  78                 linux,default-trigger = "mmc0";
  79                 gpios = <&gpio 16 1>;
  80         };
  81 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
  82 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
  83 @@ -4,6 +4,7 @@
  84  &leds {
  85         act_led: led-act {
  86                 label = "led0";
  87 +               default-state = "off";
  88                 linux,default-trigger = "mmc0";
  89                 gpios = <&gpio 47 0>;
  90         };
  91 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  92 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  93 @@ -214,6 +214,7 @@
  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         };
 101 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 102 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 103 @@ -155,6 +155,7 @@
 104  &leds {
 105         act_led: led-act {
 106                 label = "led0";
 107 +               default-state = "off";
 108                 linux,default-trigger = "actpwr";
 109                 gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 110         };
 111 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 112 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 113 @@ -158,12 +158,14 @@
 114  &leds {
 115         act_led: led-act {
 116                 label = "led0";
 117 +               default-state = "off";
 118                 linux,default-trigger = "mmc0";
 119                 gpios = <&gpio 47 0>;
 120         };
 121
 122         pwr_led: led-pwr {
 123                 label = "led1";
 124 +               default-state = "off";
 125                 linux,default-trigger = "input";
 126                 gpios = <&gpio 35 0>;
 127         };
 128 --- a/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
 129 +++ b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
 130 @@ -192,6 +192,7 @@ cam0_reg: &cam0_regulator {
 131  &leds {
 132         act_led: led-act {
 133                 label = "led0";
 134 +               default-state = "off";
 135                 linux,default-trigger = "mmc0";
 136                 gpios = <&virtgpio 0 0>;
 137         };
 138 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 139 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 140 @@ -158,12 +158,14 @@
 141  &leds {
 142         act_led: led-act {
 143                 label = "led0";
 144 +               default-state = "off";
 145                 linux,default-trigger = "mmc0";
 146                 gpios = <&gpio 47 0>;
 147         };
 148
 149         pwr_led: led-pwr {
 150                 label = "led1";
 151 +               default-state = "off";
 152                 linux,default-trigger = "input";
 153                 gpios = <&gpio 35 0>;
 154         };
 155 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 156 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 157 @@ -234,12 +234,14 @@
 158  &leds {
 159         act_led: led-act {
 160                 label = "led0";
 161 +               default-state = "off";
 162                 linux,default-trigger = "mmc0";
 163                 gpios = <&gpio 29 0>;
 164         };
 165
 166         pwr_led: led-pwr {
 167                 label = "led1";
 168 +               default-state = "off";
 169                 linux,default-trigger = "default-on";
 170                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 171         };
 172 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 173 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 174 @@ -249,12 +249,14 @@
 175  &leds {
 176         act_led: led-act {
 177                 label = "led0";
 178 +               default-state = "off";
 179                 linux,default-trigger = "mmc0";
 180                 gpios = <&virtgpio 0 0>;
 181         };
 182
 183         pwr_led: led-pwr {
 184                 label = "led1";
 185 +               default-state = "off";
 186                 linux,default-trigger = "input";
 187                 gpios = <&expgpio 7 0>;
 188         };
 189 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 190 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 191 @@ -191,6 +191,7 @@ cam0_reg: &cam0_regulator {
 192  &leds {
 193         act_led: led-act {
 194                 label = "led0";
 195 +               default-state = "off";
 196                 linux,default-trigger = "mmc0";
 197                 gpios = <&virtgpio 0 0>;
 198         };
 199 --- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
 200 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
 201 @@ -227,6 +227,7 @@
 202  &leds {
 203         act_led: led-act {
 204                 label = "led0";
 205 +               default-state = "off";
 206                 linux,default-trigger = "actpwr";
 207                 gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 208         };
 209 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 210 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 211 @@ -507,12 +507,14 @@
 212  &leds {
 213         act_led: led-act {
 214                 label = "led0";
 215 +               default-state = "off";
 216                 linux,default-trigger = "mmc0";
 217                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 218         };
 219
 220         pwr_led: led-pwr {
 221                 label = "led1";
 222 +               default-state = "off";
 223                 linux,default-trigger = "default-on";
 224                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 225         };
 226 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
 227 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
 228 @@ -514,13 +514,14 @@
 229  &leds {
 230         act_led: led-act {
 231                 label = "led0";
 232 +               default-state = "off";
 233                 linux,default-trigger = "default-on";
 234 -               default-state = "on";
 235                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 236         };
 237
 238         pwr_led: led-pwr {
 239                 label = "led1";
 240 +               default-state = "off";
 241                 linux,default-trigger = "default-on";
 242                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 243         };
 244 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 245 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 246 @@ -519,12 +519,14 @@
 247  &leds {
 248         act_led: led-act {
 249                 label = "led0";
 250 +               default-state = "off";
 251                 linux,default-trigger = "mmc0";
 252                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 253         };
 254
 255         pwr_led: led-pwr {
 256                 label = "led1";
 257 +               default-state = "off";
 258                 linux,default-trigger = "default-on";
 259                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 260         };
 261 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
 262 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
 263 @@ -389,6 +389,7 @@
 264  &leds {
 265         act_led: led-act {
 266                 label = "led0";
 267 +               default-state = "off";
 268                 linux,default-trigger = "mmc0";
 269         };
 270  };