7f257296ec
Remove the following patches: 100-ARM-dts-turris-omnia-configure-LED-0-pin-function-to [1] 101-ARM-dts-turris-omnia-enable-LED-controller-node [2] 702-net-next-ethernet-marvell-mvnetaMQPrioOffload [3] 703-net-next-ethernet-marvell-mvnetaMQPrioFlag [4] 704-net-next-ethernet-marvell-mvnetaMQPrioQueue [5] 705-net-next-ethernet-marvell-mvnetaMQPrioTCOffload [6] 710-v6.2-phy-marvell-phy-mvebu-a3700-comphy-Reset-COMPHY-regi [7] Manually rebased: 902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU All other patches automatically rebased [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=94a29bffdd59498382131fd428fed221f5c96def [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=40624346b7ae0c2b1209fc9993ea30699e512c50 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=75fa71e3acadbb4ab5eda18505277eb9a1f69b23 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e7ca75fe6662f78bfeb0112671c812e4c7b8e214 [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e9f7099d0730341b24c057acbf545dd019581db6 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2551dc9e398c37a15e52122d385c29a8b06be45f [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cd1e1735aeab49abc679218a79ee764c0d394880 Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de>
51 lines
1.2 KiB
Diff
51 lines
1.2 KiB
Diff
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
|
|
@@ -14,6 +14,13 @@
|
|
compatible = "linksys,armada385", "marvell,armada385",
|
|
"marvell,armada380";
|
|
|
|
+ aliases {
|
|
+ led-boot = &led_power;
|
|
+ led-failsafe = &led_power;
|
|
+ led-running = &led_power;
|
|
+ led-upgrade = &led_power;
|
|
+ };
|
|
+
|
|
chosen {
|
|
stdout-path = "serial0:115200n8";
|
|
};
|
|
@@ -71,7 +78,7 @@
|
|
pinctrl-0 = <&gpio_leds_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
- power {
|
|
+ led_power: power {
|
|
gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
|
|
default-state = "on";
|
|
};
|
|
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
|
|
@@ -26,6 +26,13 @@
|
|
compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
|
|
"marvell,armadaxp", "marvell,armada-370-xp";
|
|
|
|
+ aliases {
|
|
+ led-boot = &led_power;
|
|
+ led-failsafe = &led_power;
|
|
+ led-running = &led_power;
|
|
+ led-upgrade = &led_power;
|
|
+ };
|
|
+
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200";
|
|
stdout-path = &uart0;
|
|
@@ -195,7 +202,7 @@
|
|
pinctrl-0 = <&power_led_pin>;
|
|
pinctrl-names = "default";
|
|
|
|
- power {
|
|
+ led_power: power {
|
|
label = "mamba:white:power";
|
|
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
|
|
default-state = "on";
|