Merge pull request #1231 from helios-4/helios4_update

[mvebu-next] Enable hardware XOR offload and Helios4: remove fancontrol patch

config/kernel/linux-mvebu-next.config

@@ -3868,7 +3868,7 @@ CONFIG_QCOM_HIDMA=m
 #
 # DMA Clients
 #
-# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ENGINE_RAID=y
 

config/sources/mvebu-helios4.inc

@@ -41,9 +41,6 @@ family_tweaks_s()
 	# copy hwmon rules to fix device mapping
 	cp $SRC/packages/bsp/helios4/90-helios4-hwmon.rules $SDCARD/etc/udev/rules.d/
 
-	# patch fancontrol
-	patch $SDCARD/usr/sbin/fancontrol $SRC/packages/bsp/helios4/fancontrol.patch
-
 	# copy fancontrol config
 	case $BRANCH in
 	default)

packages/bsp/helios4/fancontrol.patch

@@ -1,22 +0,0 @@
---- /usr/sbin/fancontrol	2018-02-17 13:54:50.065478090 +0800
-+++ /usr/sbin/fancontrol	2018-02-17 13:58:56.910831481 +0800
-@@ -334,7 +334,7 @@
- 	# No enable file? Just set to max
- 	if [ ! -f $ENABLE ]
- 	then
--		echo $MAX > $1
-+		echo $MINPWM > $1
- 		return 0
- 	fi
- 
-@@ -433,9 +433,9 @@
- 		fi
- 
- 		# If fanspeed-sensor output shall be used, do it
-+		min_fanval=100000
- 		if [[ -n ${fan} ]]
- 		then
--			min_fanval=100000
- 			fanval=
- 			# A given PWM output can control several fans
- 			for one_fan in $(echo $fan | sed -e 's/+/ /')