mvebu: helios4 edge → 6.18 LTS, restore orphaned patches

config/boards/helios4.conf

@@ -20,3 +20,23 @@ function post_family_config__helios4_extra_packages() {
 	add_packages_to_image "fancontrol"
 	add_packages_to_image "ethtool"
 }
+
+# J17 PWM on Helios4 depends on the out-of-tree timer-assignment patch, which
+# is currently .disabled from mvebu-6.18 onwards (needs porting to the
+# refactored pwm chip API). Comment out original J17 references in
+# /etc/fancontrol so the service starts with J10-only; drop this hook once
+# the patch is ported and re-enabled.
+function post_family_tweaks_bsp__helios4_j17_disable_until_patch_ported() {
+	linux-version compare "${KERNEL_MAJOR_MINOR}" ge 6.18 || return 0
+	[[ -s "${destination}/etc/fancontrol" ]] || return 0
+	display_alert "${BOARD}" "fancontrol: commenting out J17 (no >=6.18 timer patch)" "info"
+	awk '
+		BEGIN { print "# J17 PWM disabled: mvebu >=6.18 lacks the timer-assignment patch." }
+		/\/dev\/fan-j17\/pwm1/ {
+			print "# " $0
+			gsub(/ ?\/dev\/fan-j17\/pwm1=[^ ]+/, "")
+		}
+		{ print }
+	' "${destination}/etc/fancontrol" > "${destination}/etc/fancontrol.new"
+	mv "${destination}/etc/fancontrol.new" "${destination}/etc/fancontrol"
+}

config/sources/families/mvebu.conf

@@ -31,7 +31,11 @@ case $BRANCH in
 
 	edge)
 
-		declare -g KERNEL_MAJOR_MINOR="6.15" # Major and minor versions of this kernel.
+		if [[ $BOARD == helios4 ]]; then
+			declare -g KERNEL_MAJOR_MINOR="6.18" # helios4: 6.18 LTS, restore orphaned mvebu patches
+		else
+			declare -g KERNEL_MAJOR_MINOR="6.15" # Major and minor versions of this kernel.
+		fi
 		;;
 
 esac