From ebb6fb1bec270981b4b11caa8a96b4263930857f Mon Sep 17 00:00:00 2001 From: Alban Browaeys Date: Wed, 29 Jan 2025 01:58:13 +0100 Subject: [PATCH] helios64: fix helios64-heartbeat-led.service While syncing with upstream Linux helios64 dts for 6.9 I missed the diff for the helios64 status led label (upstream was helios64:green:status instead of Armbian helios64::status) and thus broke armbian helios64-heartbeat-led.service. This commit restores the Armbian label helios64::status to let helios64-heartbeat-led.service starts. Fixes: cbaf67f00 ("Sync helios64 to its updated 6.9 dts") Signed-off-by: Alban Browaeys --- patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch | 3 ++- patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch | 3 ++- patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch index ab2da6078..db838803f 100644 --- a/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch +++ b/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch @@ -128,6 +128,7 @@ index 111111111111..222222222222 100644 + }; - led-0 { +- label = "helios64:green:status"; + sata_err5 { + label = "helios64:red:ata5-err"; + gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; @@ -163,7 +164,7 @@ index 111111111111..222222222222 100644 + pinctrl-0 = <&system_led>; + + status-led { - label = "helios64:green:status"; ++ label = "helios64::status"; gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "none"; default-state = "on"; diff --git a/patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch index def0c7d4a..3b9b2454e 100644 --- a/patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch +++ b/patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch @@ -97,6 +97,7 @@ index 111111111111..222222222222 100644 + }; - led-0 { +- label = "helios64:green:status"; + sata { + label = "helios64:blue:hdd-status"; + gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>; @@ -163,7 +164,7 @@ index 111111111111..222222222222 100644 + pinctrl-0 = <&system_led>; + + status-led { - label = "helios64:green:status"; ++ label = "helios64::status"; gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "none"; default-state = "on"; diff --git a/patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch index be107a49e..c4df93513 100644 --- a/patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch +++ b/patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch @@ -128,6 +128,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 + }; - led-0 { +- label = "helios64:green:status"; + sata_err5 { + label = "helios64:red:ata5-err"; + gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; @@ -163,7 +164,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 + pinctrl-0 = <&system_led>; + + status-led { - label = "helios64:green:status"; ++ label = "helios64::status"; gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "none"; default-state = "on";