starfive: 6.18: update LED aliases

Between 6.12 and 6.18, a 'blank' led_status_power has been added into
jh7110-common.dtsi. Update the patches responsible for adding the LED
aliases and add functionality for this LED entry.

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/target/linux/starfive/patches-6.18/1023-riscv-dts-starfive-visionfive2-add-SYSLED-support.patch b/target/linux/starfive/patches-6.18/1023-riscv-dts-starfive-visionfive2-add-SYSLED-support.patch
deleted file mode 100644 (file)
index e8db0c9..0000000
--- a/target/linux/starfive/patches-6.18/1023-riscv-dts-starfive-visionfive2-add-SYSLED-support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3a92ee5a97f030bdb1e88272a5d277ecb76836d6 Mon Sep 17 00:00:00 2001
-From: Zoltan HERPAI <wigyori@uid0.hu>
-Date: Sun, 1 Jun 2025 14:03:30 +0000
-Subject: [PATCH 7/8] riscv: dts: starfive: visionfive2: add SYSLED support
-
-A SYS LED is available at aongpio-3. Add standard heartbeat
-support for it.
-
-Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
----
- .../dts/starfive/jh7110-starfive-visionfive-2.dtsi   | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
-+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
-@@ -21,6 +21,18 @@
-                       reg = <0x0 0x6ce00000 0x0 0x1600000>;
-               };
-       };
-+
-+      leds {
-+              compatible = "gpio-leds";
-+
-+              led-ack {
-+                      gpios = <&aongpio 3 GPIO_ACTIVE_HIGH>;
-+                      color = <LED_COLOR_ID_GREEN>;
-+                      function = LED_FUNCTION_HEARTBEAT;
-+                      linux,default-trigger = "heartbeat";
-+                      label = "ack";
-+              };
-+      };
- };
- 
- &gmac0 {

diff --git a/target/linux/starfive/patches-6.18/1024-riscv-dts-starfive-visionfive2-add-LED-aliases-and-s.patch b/target/linux/starfive/patches-6.18/1024-riscv-dts-starfive-visionfive2-add-LED-aliases-and-s.patch
index cbb6c7ebda400505ba0cef0e2f5e3a539d47747d..945c854e9b47dfd798ca825ae3ca5621e71750fd 100644 (file)
--- a/target/linux/starfive/patches-6.18/1024-riscv-dts-starfive-visionfive2-add-LED-aliases-and-s.patch
+++ b/target/linux/starfive/patches-6.18/1024-riscv-dts-starfive-visionfive2-add-LED-aliases-and-s.patch
@@ -1,8 +1,7 @@
 From d930d3d22dcca6946dbdc822d7b8681f0d6372e5 Mon Sep 17 00:00:00 2001
 From: Zoltan HERPAI <wigyori@uid0.hu>
 Date: Sun, 1 Jun 2025 14:06:04 +0000
-Subject: [PATCH 8/8] riscv: dts: starfive: visionfive2: add LED aliases and
- stop heartbeat
+Subject: [PATCH 8/8] riscv: dts: starfive: visionfive2: add LED aliases
 
 Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
 ---
@@ -20,24 +19,23 @@ Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
  / {
        aliases {
                ethernet1 = &gmac1;
-+              led-boot = &led_ack;
-+              led-failsafe = &led_ack;
-+              led-running = &led_ack;
-+              led-upgrade = &led_ack;
++              led-boot = &led_status_power;
++              led-failsafe = &led_status_power;
++              led-running = &led_status_power;
++              led-upgrade = &led_status_power;
        };
  
        reserved-memory {
-@@ -25,11 +30,11 @@
-       leds {
-               compatible = "gpio-leds";
+@@ -65,6 +70,12 @@
+       status = "okay";
+ };
  
--              led-ack {
-+              led_ack: led-ack {
-                       gpios = <&aongpio 3 GPIO_ACTIVE_HIGH>;
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_HEARTBEAT;
--                      linux,default-trigger = "heartbeat";
-+                      default-state = "on";
-                       label = "ack";
-               };
-       };
++&led_status_power {
++      color = <LED_COLOR_ID_GREEN>;
++      default-state = "on";
++      label = "status_power";
++};
++
+ &mmc0 {
+       non-removable;
+ };

diff --git a/target/linux/starfive/patches-6.18/1025-riscv-dts-starfive-visionfive2-add-dma-pool-entry.patch b/target/linux/starfive/patches-6.18/1025-riscv-dts-starfive-visionfive2-add-dma-pool-entry.patch
index 437266cc6d2dd5198c6286b761c2e5dc9aa727ad..7746b73112dd8508dcec1b209a0121e4b24ab05b 100644 (file)
--- a/target/linux/starfive/patches-6.18/1025-riscv-dts-starfive-visionfive2-add-dma-pool-entry.patch
+++ b/target/linux/starfive/patches-6.18/1025-riscv-dts-starfive-visionfive2-add-dma-pool-entry.patch
@@ -27,5 +27,5 @@ Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
 +                      linux,cma-default;
 +              };
        };
+ };
  
-       leds {