This adds the default-state = "on"; statement for the power or
primary status LED in DTS on kirkwood. This will ensure that this
LED will be lit up very early in the boot process (i.e. before
diag.sh is executed) and thus will provide an additional hint to the
user when problems arise during early boot process.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
26 files changed:
memory {
device_type = "memory";
memory {
device_type = "memory";
&pmx_led_usb_transfer>;
pinctrl-names = "default";
&pmx_led_usb_transfer>;
pinctrl-names = "default";
label = "ib62x0:green:os";
gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
label = "ib62x0:green:os";
gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
};
- red-os {
+ led_red_os: red-os {
label = "ib62x0:red:os";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
};
};
- red-os {
+ led_red_os: red-os {
label = "ib62x0:red:os";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
};
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
label = "power:blue";
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
label = "power:blue";
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
};
- power-red {
+ led_power_red: power-red {
label = "power:red";
gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
};
};
- power-red {
+ led_power_red: power-red {
label = "power:red";
gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
};
status = "okay";
partition@0 {
status = "okay";
partition@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
pinctrl-names = "default";
pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
pinctrl-names = "default";
label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep";
label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep";
};
- fault {
+ led_fault: fault {
label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
};
- fault {
+ led_fault: fault {
label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
partition@0 {
label = "u-boot";
partition@0 {
label = "u-boot";
memory {
device_type = "memory";
reg = <0x00000000 0x10000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x10000000>;
&pmx_led_rebuild &pmx_led_health >;
pinctrl-names = "default";
&pmx_led_rebuild &pmx_led_health >;
pinctrl-names = "default";
label = "status:white:power_led";
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
label = "status:white:power_led";
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
};
rebuild_led {
label = "status:white:rebuild_led";
};
rebuild_led {
label = "status:white:rebuild_led";
label = "status:red:health_led";
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
};
label = "status:red:health_led";
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
};
reg = <0x400000 0x1C00000>;
};
};
reg = <0x400000 0x1C00000>;
};
};
kirkwood-lsxhl.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
kirkwood-lsxhl.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
+/*
+ * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
+ *
+/*
+ * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
+ *
+ led_power: power {
+ label = "audi:green:power";
+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+ led_power: power {
+ label = "audi:green:power";
+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
pinctrl-names = "default";
pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
pinctrl-names = "default";
+ led_white_health: white-health {
label = "viper:white:health";
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+ led_white_health: white-health {
label = "viper:white:health";
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+
+ white-pulse {
+@@ -69,9 +74,18 @@
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
reg = <0x1EA0000 0x1760000>;
};
reg = <0x1EA0000 0x1760000>;
};
};
/* eth1 is connected to the switch at port 6. However DSA only supports a
};
/* eth1 is connected to the switch at port 6. However DSA only supports a
kirkwood-ib62x0.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
kirkwood-ib62x0.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+ led_health: health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ led_health: health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ };
+ led_fault: fault {
+ label = "status:orange:fault";
+ };
+ led_fault: fault {
+ label = "status:orange:fault";
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
>;
pinctrl-names = "default";
>;
pinctrl-names = "default";
label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep";
label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep";
};
- fault {
+ led_fault: fault {
label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
};
- fault {
+ led_fault: fault {
label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
kirkwood-openblocks_a6.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-nsa310b.dts
kirkwood-openblocks_a6.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-nsa310b.dts
+/dts-v1/;
+
+#include "kirkwood-nsa3x0-common.dtsi"
+/dts-v1/;
+
+#include "kirkwood-nsa3x0-common.dtsi"
+ led_green_sys: green-sys {
+ label = "nsa310:green:sys";
+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ led_green_sys: green-sys {
+ label = "nsa310:green:sys";
+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ };
+ led_red_sys: red-sys {
+ label = "nsa310:red:sys";
+ };
+ led_red_sys: red-sys {
+ label = "nsa310:red:sys";
memory {
device_type = "memory";
reg = <0x00000000 0x20000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x20000000>;
&pmx_led_hdd1_green &pmx_led_hdd1_red>;
pinctrl-names = "default";
&pmx_led_hdd1_green &pmx_led_hdd1_red>;
pinctrl-names = "default";
+ led_green_sys: green-sys {
label = "nsa325:green:sys";
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ led_green_sys: green-sys {
label = "nsa325:green:sys";
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
};
- orange-sys {
+ led_orange_sys: orange-sys {
};
- orange-sys {
+ led_orange_sys: orange-sys {
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-on100.dts
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-on100.dts
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+ led_health_green: health_green {
+ label = "on100:green:health";
+ gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+ led_health_green: health_green {
+ label = "on100:green:health";
+ gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+ };
+
+ led_health_red: health_red {
+ };
+
+ led_health_red: health_red {
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
};
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
};
pinctrl-0 = <&pmx_led_green &pmx_led_red>;
pinctrl-names = "default";
pinctrl-0 = <&pmx_led_green &pmx_led_red>;
pinctrl-names = "default";
+ led_health: health {
label = "pogoplugv4:green:health";
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
+ led_health: health {
label = "pogoplugv4:green:health";
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
};
- fault {
+ led_fault: fault {
label = "pogoplugv4:red:fault";
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
};
};
- fault {
+ led_fault: fault {
label = "pogoplugv4:red:fault";
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
};
#size-cells = <1>;
partition@0 {
#size-cells = <1>;
partition@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x10000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x10000000>;
gpio-leds {
compatible = "gpio-leds";
gpio-leds {
compatible = "gpio-leds";
label = "pogo_e02:green:health";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
- default-state = "keep";
label = "pogo_e02:green:health";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
- default-state = "keep";
};
- fault {
+ led_fault: fault {
};
- fault {
+ led_fault: fault {
memory {
device_type = "memory";
memory {
device_type = "memory";
&pmx_led_usb_transfer>;
pinctrl-names = "default";
&pmx_led_usb_transfer>;
pinctrl-names = "default";
label = "ib62x0:green:os";
gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
label = "ib62x0:green:os";
gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
};
- red-os {
+ led_red_os: red-os {
label = "ib62x0:red:os";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
};
};
- red-os {
+ led_red_os: red-os {
label = "ib62x0:red:os";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
};
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
label = "power:blue";
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
label = "power:blue";
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
};
- power-red {
+ led_power_red: power-red {
label = "power:red";
gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
};
};
- power-red {
+ led_power_red: power-red {
label = "power:red";
gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
};
status = "okay";
partition@0 {
status = "okay";
partition@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
pinctrl-names = "default";
pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
pinctrl-names = "default";
label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep";
label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep";
};
- fault {
+ led_fault: fault {
label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
};
- fault {
+ led_fault: fault {
label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
partition@0 {
label = "u-boot";
partition@0 {
label = "u-boot";
memory {
device_type = "memory";
reg = <0x00000000 0x10000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x10000000>;
&pmx_led_rebuild &pmx_led_health >;
pinctrl-names = "default";
&pmx_led_rebuild &pmx_led_health >;
pinctrl-names = "default";
label = "status:white:power_led";
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
label = "status:white:power_led";
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
};
rebuild_led {
label = "status:white:rebuild_led";
};
rebuild_led {
label = "status:white:rebuild_led";
label = "status:red:health_led";
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
};
label = "status:red:health_led";
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
};
reg = <0x400000 0x1C00000>;
};
};
reg = <0x400000 0x1C00000>;
};
};
kirkwood-lsxhl.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
kirkwood-lsxhl.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
+ led_power: power {
+ label = "audi:green:power";
+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+ led_power: power {
+ label = "audi:green:power";
+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
pinctrl-names = "default";
pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
pinctrl-names = "default";
+ led_white_health: white-health {
label = "viper:white:health";
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+ led_white_health: white-health {
label = "viper:white:health";
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+
+ white-pulse {
+@@ -67,9 +72,23 @@
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
reg = <0x1EA0000 0x1760000>;
};
reg = <0x1EA0000 0x1760000>;
};
};
/* eth1 is connected to the switch at port 6. However DSA only supports a
};
/* eth1 is connected to the switch at port 6. However DSA only supports a
kirkwood-ib62x0.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
kirkwood-ib62x0.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+ led_health: health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ led_health: health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ };
+ led_fault: fault {
+ label = "status:orange:fault";
+ };
+ led_fault: fault {
+ label = "status:orange:fault";
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
>;
pinctrl-names = "default";
>;
pinctrl-names = "default";
label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep";
label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep";
};
- fault {
+ led_fault: fault {
label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
};
- fault {
+ led_fault: fault {
label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
kirkwood-openblocks_a6.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-nsa310b.dts
kirkwood-openblocks_a6.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-nsa310b.dts
+/dts-v1/;
+
+#include "kirkwood-nsa3x0-common.dtsi"
+/dts-v1/;
+
+#include "kirkwood-nsa3x0-common.dtsi"
+ led_green_sys: green-sys {
+ label = "nsa310:green:sys";
+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ led_green_sys: green-sys {
+ label = "nsa310:green:sys";
+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ };
+ led_red_sys: red-sys {
+ label = "nsa310:red:sys";
+ };
+ led_red_sys: red-sys {
+ label = "nsa310:red:sys";
memory {
device_type = "memory";
reg = <0x00000000 0x20000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x20000000>;
&pmx_led_hdd1_green &pmx_led_hdd1_red>;
pinctrl-names = "default";
&pmx_led_hdd1_green &pmx_led_hdd1_red>;
pinctrl-names = "default";
+ led_green_sys: green-sys {
label = "nsa325:green:sys";
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ led_green_sys: green-sys {
label = "nsa325:green:sys";
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
};
- orange-sys {
+ led_orange_sys: orange-sys {
};
- orange-sys {
+ led_orange_sys: orange-sys {
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-on100.dts
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-on100.dts
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+ led_health_green: health_green {
+ label = "on100:green:health";
+ gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+ led_health_green: health_green {
+ label = "on100:green:health";
+ gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+ };
+
+ led_health_red: health_red {
+ };
+
+ led_health_red: health_red {
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
};
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
};
pinctrl-0 = <&pmx_led_green &pmx_led_red>;
pinctrl-names = "default";
pinctrl-0 = <&pmx_led_green &pmx_led_red>;
pinctrl-names = "default";
+ led_health: health {
label = "pogoplugv4:green:health";
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
+ led_health: health {
label = "pogoplugv4:green:health";
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
};
- fault {
+ led_fault: fault {
label = "pogoplugv4:red:fault";
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
};
};
- fault {
+ led_fault: fault {
label = "pogoplugv4:red:fault";
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
};
#size-cells = <1>;
partition@0 {
#size-cells = <1>;
partition@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x10000000>;
memory {
device_type = "memory";
reg = <0x00000000 0x10000000>;
gpio-leds {
compatible = "gpio-leds";
gpio-leds {
compatible = "gpio-leds";
label = "pogo_e02:green:health";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
- default-state = "keep";
label = "pogo_e02:green:health";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
- default-state = "keep";
};
- fault {
+ led_fault: fault {
};
- fault {
+ led_fault: fault {