diff --git a/config/sources/mvebu-helios4.inc b/config/sources/mvebu-helios4.inc index dae5cd18f..7dad9301f 100644 --- a/config/sources/mvebu-helios4.inc +++ b/config/sources/mvebu-helios4.inc @@ -22,12 +22,12 @@ family_tweaks_s() cp -R $SRC/packages/bsp/helios4/90-helios4-hwmon.rules $SDCARD/etc/udev/rules.d/ case $BRANCH in default) - cp -R $SRC/packages/bsp/helios4/fancontrol_pwm-fan-LK4.4.conf $SDCARD/etc/fancontrol + cp -R $SRC/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-default.conf $SDCARD/etc/fancontrol ;; next) - cp -R $SRC/packages/bsp/helios4/fancontrol_pwm-fan.conf $SDCARD/etc/fancontrol - patch $SDCARD/usr/sbin/fancontrol < $SRC/packages/bsp/helios4/fancontrol.patch + cp -R $SRC/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-next.conf $SDCARD/etc/fancontrol + #patch $SDCARD/usr/sbin/fancontrol < $SRC/packages/bsp/helios4/fancontrol.patch ;; esac } diff --git a/packages/bsp/helios4/fancontrol_gpio-fan.conf b/packages/bsp/helios4/fancontrol_gpio-fan.conf deleted file mode 100644 index 556c823c4..000000000 --- a/packages/bsp/helios4/fancontrol_gpio-fan.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Helios4 GPIO Fan Control Configuration -# This is a temporary configuration while relying on gpio-fan driver. -# Only low or full speed is supported. -# Temp source : lm75 sensor -INTERVAL=10 -DEVPATH=hwmon0=devices/platform/j10-pwm hwmon1=devices/platform/j17-pwm hwmon2=devices/platform/soc/soc:internal-regs/f1011000.i2c/i2c-0/0-004c -DEVNAME=hwmon0=gpio_fan hwmon1=gpio_fan hwmon2=lm75 -FCTEMPS=hwmon0/pwm1=hwmon2/temp1_input hwmon1/pwm1=hwmon2/temp1_input -MINTEMP=hwmon0/pwm1=45 hwmon1/pwm1=45 -MAXTEMP=hwmon0/pwm1=65 hwmon1/pwm1=65 -MINSTART=hwmon0/pwm1=1 hwmon1/pwm1=1 -MINSTOP=hwmon0/pwm1=0 hwmon1/pwm1=0 diff --git a/packages/bsp/helios4/fancontrol_pwm-fan-LK4.4.conf b/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-default.conf similarity index 100% rename from packages/bsp/helios4/fancontrol_pwm-fan-LK4.4.conf rename to packages/bsp/helios4/fancontrol_pwm-fan-mvebu-default.conf diff --git a/packages/bsp/helios4/fancontrol_pwm-fan.conf b/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-next.conf similarity index 100% rename from packages/bsp/helios4/fancontrol_pwm-fan.conf rename to packages/bsp/helios4/fancontrol_pwm-fan-mvebu-next.conf diff --git a/patch/kernel/mvebu-default/95-helios4-device-tree.patch b/patch/kernel/mvebu-default/95-helios4-device-tree.patch index fd7410067..c36487654 100644 --- a/patch/kernel/mvebu-default/95-helios4-device-tree.patch +++ b/patch/kernel/mvebu-default/95-helios4-device-tree.patch @@ -125,12 +125,12 @@ index 0000000..19a0256 + + fan1: j10-pwm { + compatible = "pwm-fan"; -+ pwms = <&gpio1 9 3800>; ++ pwms = <&gpio1 9 40000>; /* Target freq:25 kHz */ + }; + + fan2: j17-pwm { + compatible = "pwm-fan"; -+ pwms = <&gpio1 23 3800>; ++ pwms = <&gpio1 23 40000>; /* Target freq:25 kHz */ + }; + + usb2_phy: usb2-phy {