Skip to content

L
linux
Commit 1156e3a7 authored by Stefan Wahren's avatar Stefan Wahren Committed by Florian Fainelli
Browse files
Options

ARM: dts: bcm283x: Move ACT LED into separate dtsi 

The usage of the label property for gpio-leds has been deprecated
a long time ago. In bcm2835-rpi.dtsi the ACT LED uses such a label
and derive it to almost every Raspberry Pi board. Since we cannot break
userspace interface this property must be kept. But we can move the
ACT LED into a separate dtsi and include them from the board files.

This change have two benefits:
- with both new refs it's now clear the LED part is included from a dtsi
- new boards do not include the deprecated stuff automatically
Reported-by: default avatarAlexander Dahl <ada@thorsis.com>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20221110173105.6633-3-stefan.wahren@i2se.comSigned-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent a9865ec3
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 159 deletions
arch/arm/boot/dts/bcm2711-rpi-4-b.dts
View file @ 1156e3a7
......@@ -2,6 +2,7 @@
/dts-v1/;
#include "bcm2711.dtsi"
#include "bcm2711-rpi.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-peripheral.dtsi"
#include "bcm283x-rpi-wifi-bt.dtsi"
......@@ -14,19 +15,6 @@ chosen {
stdout-path = "serial1:115200n8";
};
leds {
led-act {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
sd_io_1v8_reg: regulator-sd-io-1v8 {
compatible = "regulator-gpio";
regulator-name = "vdd-sd-io";
......@@ -156,6 +144,19 @@ &hdmi1 {
status = "okay";
};
&led_act {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
&leds {
led_pwr: led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
&pixelvalve0 {
status = "okay";
};
......
arch/arm/boot/dts/bcm2711-rpi-400.dts
View file @ 1156e3a7
......@@ -11,14 +11,6 @@ chosen {
stdout-path = "serial1:115200n8";
};
leds {
/delete-node/ led-act;
led-pwr {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
};
gpio-poweroff {
compatible = "gpio-poweroff";
gpios = <&expgpio 5 GPIO_ACTIVE_HIGH>;
......@@ -40,6 +32,14 @@ &genet_mdio {
clock-frequency = <1950000>;
};
&led_pwr {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
&leds {
/delete-node/ led_act;
};
&pm {
/delete-property/ system-power-controller;
};
arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts
View file @ 1156e3a7
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2711-rpi-cm4.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
/ {
model = "Raspberry Pi Compute Module 4 IO Board";
leds {
led-act {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
};
&ddc0 {
......@@ -113,6 +101,19 @@ &genet {
status = "okay";
};
&led_act {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
&leds {
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
&pixelvalve0 {
status = "okay";
};
......
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
View file @ 1156e3a7
......@@ -3,6 +3,7 @@
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2835-rpi-common.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
/ {
......@@ -13,19 +14,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
};
&gpio {
......@@ -108,6 +96,19 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
&leds {
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
......
arch/arm/boot/dts/bcm2835-rpi-a.dts
View file @ 1156e3a7
......@@ -3,6 +3,7 @@
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2835-rpi-common.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
/ {
......@@ -13,12 +14,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
};
&gpio {
......@@ -103,6 +98,10 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
......
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View file @ 1156e3a7
......@@ -3,6 +3,7 @@
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2835-rpi-common.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
......@@ -14,19 +15,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x20000000>;
};
leds {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
};
&gpio {
......@@ -110,6 +98,19 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
&leds {
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
......
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
View file @ 1156e3a7
......@@ -3,6 +3,7 @@
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2835-rpi-common.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-smsc9512.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
......@@ -14,12 +15,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
};
&gpio {
......@@ -103,6 +98,10 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
......
arch/arm/boot/dts/bcm2835-rpi-b.dts
View file @ 1156e3a7
......@@ -3,6 +3,7 @@
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2835-rpi-common.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-smsc9512.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
......@@ -14,12 +15,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
};
&gpio {
......@@ -97,6 +92,10 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
......
arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
View file @ 1156e3a7
......@@ -3,6 +3,7 @@
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2835-rpi-common.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
/ {
leds {
......@@ -33,6 +34,10 @@ reg_1v8: fixed-regulator {
};
};
&led_act {
gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
};
&sdhost {
non-removable;
vmmc-supply = <&reg_3v3>;
......
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
View file @ 1156e3a7
......@@ -7,6 +7,7 @@
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2835-rpi-common.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-otg.dtsi"
#include "bcm283x-rpi-wifi-bt.dtsi"
......@@ -23,12 +24,6 @@ chosen {
/* 8250 auxiliary UART instead of pl011 */
stdout-path = "serial1:115200n8";
};
leds {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
};
};
};
&bt {
......@@ -111,6 +106,10 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
};
&sdhci {
pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
};
......
arch/arm/boot/dts/bcm2835-rpi-zero.dts
View file @ 1156e3a7
......@@ -7,6 +7,7 @@
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2835-rpi-common.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-otg.dtsi"
/ {
......@@ -17,12 +18,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x20000000>;
};
leds {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
};
};
&gpio {
......@@ -105,6 +100,10 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
......
arch/arm/boot/dts/bcm2835-rpi.dtsi
View file @ 1156e3a7
#include <dt-bindings/power/raspberrypi-power.h>
/ {
leds {
compatible = "gpio-leds";
led-act {
label = "ACT";
default-state = "keep";
linux,default-trigger = "heartbeat";
};
};
soc {
firmware: firmware {
compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
......
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
View file @ 1156e3a7
......@@ -2,6 +2,7 @@
/dts-v1/;
#include "bcm2836.dtsi"
#include "bcm2836-rpi.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
......@@ -13,19 +14,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x40000000>;
};
leds {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
};
&gpio {
......@@ -109,6 +97,19 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
&leds {
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
......
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
View file @ 1156e3a7
......@@ -2,6 +2,7 @@
/dts-v1/;
#include "bcm2837.dtsi"
#include "bcm2836-rpi.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
#include "bcm283x-rpi-wifi-bt.dtsi"
......@@ -18,19 +19,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x20000000>;
};
leds {
led-act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
};
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
};
&firmware {
......@@ -124,6 +112,19 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
};
&leds {
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
......
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
View file @ 1156e3a7
......@@ -3,6 +3,7 @@
#include "bcm2837.dtsi"
#include "bcm2836-rpi.dtsi"
#include "bcm283x-rpi-lan7515.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
#include "bcm283x-rpi-wifi-bt.dtsi"
......@@ -19,19 +20,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x40000000>;
};
leds {
led-act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
};
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
};
&bt {
......@@ -130,6 +118,19 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
};
&leds {
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
};
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
......
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
View file @ 1156e3a7
......@@ -2,6 +2,7 @@
/dts-v1/;
#include "bcm2837.dtsi"
#include "bcm2836-rpi.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
#include "bcm283x-rpi-wifi-bt.dtsi"
......@@ -19,12 +20,6 @@ memory@0 {
device_type = "memory";
reg = <0 0x40000000>;
};
leds {
led-act {
gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
};
};
};
&bt {
......@@ -129,6 +124,10 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
};
/* uart0 communicates with the BT module */
&uart0 {
pinctrl-names = "default";
......
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
View file @ 1156e3a7
......@@ -9,14 +9,6 @@ memory@0 {
reg = <0 0x40000000>;
};
leds {
/*
* Since there is no upstream GPIO driver yet,
* remove the incomplete node.
*/
/delete-node/ led-act;
};
reg_3v3: fixed-regulator {
compatible = "regulator-fixed";
regulator-name = "3V3";
......
arch/arm/boot/dts/bcm2837-rpi-zero-2-w.dts
View file @ 1156e3a7
......@@ -6,6 +6,7 @@
/dts-v1/;
#include "bcm2837.dtsi"
#include "bcm2836-rpi.dtsi"
#include "bcm283x-rpi-led-deprecated.dtsi"
#include "bcm283x-rpi-usb-otg.dtsi"
#include "bcm283x-rpi-wifi-bt.dtsi"
......@@ -22,12 +23,6 @@ chosen {
/* 8250 auxiliary UART instead of pl011 */
stdout-path = "serial1:115200n8";
};
leds {
led-act {
gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
};
};
};
&bt {
......@@ -109,6 +104,10 @@ &hdmi {
status = "okay";
};
&led_act {
gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
};
&sdhci {
pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
};
......
arch/arm/boot/dts/bcm283x-rpi-led-deprecated.dtsi 0 → 100644
View file @ 1156e3a7
// SPDX-License-Identifier: GPL-2.0
/ {
/*
* This file provides the now deprecated ACT LED to the
* Raspberry Pi boards. Please don't include this file
* for new boards!
*/
leds: leds {
compatible = "gpio-leds";
led_act: led-act {
label = "ACT";
default-state = "keep";
linux,default-trigger = "heartbeat";
};
};
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7