diff --git a/src/mainboard/google/beltino/acpi/thermal.asl b/src/mainboard/google/beltino/acpi/thermal.asl index 40564c3ad7..7e9d413c59 100644 --- a/src/mainboard/google/beltino/acpi/thermal.asl +++ b/src/mainboard/google/beltino/acpi/thermal.asl @@ -141,11 +141,7 @@ Scope (\_TZ) } Method (_AC4) { - If (\FLVL <= 4) { - Return (CTOK (FAN4_THRESHOLD_OFF)) - } Else { - Return (CTOK (FAN4_THRESHOLD_ON)) - } + Return (CTOK (0)) } Name (_AL0, Package () { FAN0 }) diff --git a/src/mainboard/google/beltino/variants/mccloud/include/variant/thermal.h b/src/mainboard/google/beltino/variants/mccloud/include/variant/thermal.h index f4c0474329..4a84032609 100644 --- a/src/mainboard/google/beltino/variants/mccloud/include/variant/thermal.h +++ b/src/mainboard/google/beltino/variants/mccloud/include/variant/thermal.h @@ -3,29 +3,27 @@ #ifndef THERMAL_H #define THERMAL_H -/* Fan is OFF */ -#define FAN4_THRESHOLD_OFF 0 -#define FAN4_THRESHOLD_ON 0 +/* Fan is OFF at idle (passive cooling) */ #define FAN4_PWM 0x00 /* Fan is at LOW speed */ -#define FAN3_THRESHOLD_OFF 35 -#define FAN3_THRESHOLD_ON 40 -#define FAN3_PWM 0x88 +#define FAN3_THRESHOLD_OFF 40 +#define FAN3_THRESHOLD_ON 50 +#define FAN3_PWM 0x68 /* Fan is at MEDIUM speed */ -#define FAN2_THRESHOLD_OFF 44 -#define FAN2_THRESHOLD_ON 48 -#define FAN2_PWM 0x94 +#define FAN2_THRESHOLD_OFF 55 +#define FAN2_THRESHOLD_ON 67 +#define FAN2_PWM 0x84 /* Fan is at HIGH speed */ -#define FAN1_THRESHOLD_OFF 53 -#define FAN1_THRESHOLD_ON 58 -#define FAN1_PWM 0xb5 +#define FAN1_THRESHOLD_OFF 67 +#define FAN1_THRESHOLD_ON 75 +#define FAN1_PWM 0xa5 /* Fan is at FULL speed */ -#define FAN0_THRESHOLD_OFF 65 -#define FAN0_THRESHOLD_ON 70 +#define FAN0_THRESHOLD_OFF 85 +#define FAN0_THRESHOLD_ON 90 #define FAN0_PWM 0xc4 /* Temperature which OS will shutdown at */ diff --git a/src/mainboard/google/beltino/variants/monroe/include/variant/thermal.h b/src/mainboard/google/beltino/variants/monroe/include/variant/thermal.h index c2a2ef09b8..0074f0dd91 100644 --- a/src/mainboard/google/beltino/variants/monroe/include/variant/thermal.h +++ b/src/mainboard/google/beltino/variants/monroe/include/variant/thermal.h @@ -3,30 +3,28 @@ #ifndef THERMAL_H #define THERMAL_H -/* Fan is OFF */ -#define FAN4_THRESHOLD_OFF 0 -#define FAN4_THRESHOLD_ON 0 +/* Fan is OFF at idle (passive cooling) */ #define FAN4_PWM 0x00 /* Fan is at LOW speed */ -#define FAN3_THRESHOLD_OFF 45 -#define FAN3_THRESHOLD_ON 58 -#define FAN3_PWM 0x40 +#define FAN3_THRESHOLD_OFF 40 +#define FAN3_THRESHOLD_ON 50 +#define FAN3_PWM 0x68 /* Fan is at MEDIUM speed */ -#define FAN2_THRESHOLD_OFF 52 -#define FAN2_THRESHOLD_ON 64 -#define FAN2_PWM 0x80 +#define FAN2_THRESHOLD_OFF 55 +#define FAN2_THRESHOLD_ON 67 +#define FAN2_PWM 0x84 /* Fan is at HIGH speed */ -#define FAN1_THRESHOLD_OFF 59 -#define FAN1_THRESHOLD_ON 68 -#define FAN1_PWM 0xb3 +#define FAN1_THRESHOLD_OFF 67 +#define FAN1_THRESHOLD_ON 75 +#define FAN1_PWM 0xa3 /* Fan is at FULL speed */ -#define FAN0_THRESHOLD_OFF 66 -#define FAN0_THRESHOLD_ON 79 -#define FAN0_PWM 0xff +#define FAN0_THRESHOLD_OFF 85 +#define FAN0_THRESHOLD_ON 90 +#define FAN0_PWM 0xc4 /* Temperature which OS will shutdown at */ #define CRITICAL_TEMPERATURE 98 diff --git a/src/mainboard/google/beltino/variants/panther/include/variant/thermal.h b/src/mainboard/google/beltino/variants/panther/include/variant/thermal.h index 27c6c33756..07f7c9f075 100644 --- a/src/mainboard/google/beltino/variants/panther/include/variant/thermal.h +++ b/src/mainboard/google/beltino/variants/panther/include/variant/thermal.h @@ -3,9 +3,7 @@ #ifndef THERMAL_H #define THERMAL_H -/* Fan is OFF */ -#define FAN4_THRESHOLD_OFF 0 -#define FAN4_THRESHOLD_ON 0 +/* Fan is OFF at idle (passive cooling) */ #define FAN4_PWM 0x00 /* Fan is at LOW speed */ @@ -14,22 +12,22 @@ #define FAN3_PWM 0x6b /* Fan is at MEDIUM speed */ -#define FAN2_THRESHOLD_OFF 75 -#define FAN2_THRESHOLD_ON 83 -#define FAN2_PWM 0xcc +#define FAN2_THRESHOLD_OFF 55 +#define FAN2_THRESHOLD_ON 67 +#define FAN2_PWM 0x86 /* Fan is at HIGH speed */ -#define FAN1_THRESHOLD_OFF 86 -#define FAN1_THRESHOLD_ON 90 -#define FAN1_PWM 0xe5 +#define FAN1_THRESHOLD_OFF 67 +#define FAN1_THRESHOLD_ON 75 +#define FAN1_PWM 0xa8 /* Fan is at FULL speed */ -#define FAN0_THRESHOLD_OFF 93 -#define FAN0_THRESHOLD_ON 96 -#define FAN0_PWM 0xff +#define FAN0_THRESHOLD_OFF 85 +#define FAN0_THRESHOLD_ON 90 +#define FAN0_PWM 0xdc /* Temperature which OS will shutdown at */ -#define CRITICAL_TEMPERATURE 100 +#define CRITICAL_TEMPERATURE 98 /* Temperature which OS will throttle CPU */ #define PASSIVE_TEMPERATURE 90 diff --git a/src/mainboard/google/beltino/variants/tricky/include/variant/thermal.h b/src/mainboard/google/beltino/variants/tricky/include/variant/thermal.h index 68db6b89e6..791f2dd279 100644 --- a/src/mainboard/google/beltino/variants/tricky/include/variant/thermal.h +++ b/src/mainboard/google/beltino/variants/tricky/include/variant/thermal.h @@ -3,9 +3,7 @@ #ifndef THERMAL_H #define THERMAL_H -/* Fan is OFF */ -#define FAN4_THRESHOLD_OFF 0 -#define FAN4_THRESHOLD_ON 0 +/* Fan is OFF at idle (passive cooling) */ #define FAN4_PWM 0x00 /* Fan is at LOW speed */ diff --git a/src/mainboard/google/beltino/variants/zako/include/variant/thermal.h b/src/mainboard/google/beltino/variants/zako/include/variant/thermal.h index 5006b64983..7a1cbc77ec 100644 --- a/src/mainboard/google/beltino/variants/zako/include/variant/thermal.h +++ b/src/mainboard/google/beltino/variants/zako/include/variant/thermal.h @@ -3,30 +3,28 @@ #ifndef THERMAL_H #define THERMAL_H -/* Fan is OFF */ -#define FAN4_THRESHOLD_OFF 0 -#define FAN4_THRESHOLD_ON 0 -#define FAN4_PWM 0x4c +/* Fan is OFF at idle (passive cooling) */ +#define FAN4_PWM 0x00 /* Fan is at LOW speed */ -#define FAN3_THRESHOLD_OFF 48 -#define FAN3_THRESHOLD_ON 52 +#define FAN3_THRESHOLD_OFF 40 +#define FAN3_THRESHOLD_ON 50 #define FAN3_PWM 0x6d /* Fan is at MEDIUM speed */ -#define FAN2_THRESHOLD_OFF 50 -#define FAN2_THRESHOLD_ON 55 +#define FAN2_THRESHOLD_OFF 55 +#define FAN2_THRESHOLD_ON 67 #define FAN2_PWM 0x7c /* Fan is at HIGH speed */ -#define FAN1_THRESHOLD_OFF 52 -#define FAN1_THRESHOLD_ON 58 +#define FAN1_THRESHOLD_OFF 67 +#define FAN1_THRESHOLD_ON 75 #define FAN1_PWM 0xa3 /* Fan is at FULL speed */ -#define FAN0_THRESHOLD_OFF 55 -#define FAN0_THRESHOLD_ON 60 -#define FAN0_PWM 0xba +#define FAN0_THRESHOLD_OFF 85 +#define FAN0_THRESHOLD_ON 90 +#define FAN0_PWM 0xdc /* Temperature which OS will shutdown at */ #define CRITICAL_TEMPERATURE 98