From 3a782b1710df9c75447b453dcc5c7dc195fcaed0 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 2 Nov 2020 22:46:34 +0100 Subject: [PATCH] mainboard: Use get_int_option() for HWM settings Change-Id: I97fbbf2af76a6d4c44221000da7b36378e066ff3 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/47135 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/mainboard/ibase/mb899/superio_hwm.c | 18 ++++++------------ src/mainboard/kontron/986lcd-m/mainboard.c | 12 ++++-------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/mainboard/ibase/mb899/superio_hwm.c b/src/mainboard/ibase/mb899/superio_hwm.c index 6b2d77ae1b..e1189a595b 100644 --- a/src/mainboard/ibase/mb899/superio_hwm.c +++ b/src/mainboard/ibase/mb899/superio_hwm.c @@ -52,19 +52,13 @@ void hwm_setup(void) int cpufan_speed = 0, sysfan_speed = 0; int cpufan_temperature = 0, sysfan_temperature = 0; - cpufan_control = FAN_CRUISE_CONTROL_DISABLED; - get_option(&cpufan_control, "cpufan_cruise_control"); - cpufan_speed = FAN_SPEED_5625; - get_option(&cpufan_speed, "cpufan_speed"); - //cpufan_temperature = FAN_TEMPERATURE_30DEGC; - //get_option(&cpufan_temperature, "cpufan_temperature"); + cpufan_control = get_int_option("cpufan_cruise_control", FAN_CRUISE_CONTROL_DISABLED); + cpufan_speed = get_int_option("cpufan_speed", FAN_SPEED_5625); + //cpufan_temperature = get_int_option("cpufan_temperature", FAN_TEMPERATURE_30DEGC); - sysfan_control = FAN_CRUISE_CONTROL_DISABLED; - get_option(&sysfan_control, "sysfan_cruise_control"); - sysfan_speed = FAN_SPEED_5625; - get_option(&sysfan_speed, "sysfan_speed"); - //sysfan_temperature = FAN_TEMPERATURE_30DEGC; - //get_option(&sysfan_temperature, "sysfan_temperature"); + sysfan_control = get_int_option("sysfan_cruise_control", FAN_CRUISE_CONTROL_DISABLED); + sysfan_speed = get_int_option("sysfan_speed", FAN_SPEED_5625); + //sysfan_temperature = get_int_option("sysfan_temperature", FAN_TEMPERATURE_30DEGC); // pnp_write_hwm5_index(HWM_BASE, 0x31, 0x20); // AVCC high limit // pnp_write_hwm5_index(HWM_BASE, 0x34, 0x06); // VIN2 low limit diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index 26a800aa5a..9aed0cdf2f 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -50,15 +50,11 @@ static void hwm_setup(void) int cpufan_speed = 0, sysfan_speed = 0; int cpufan_temperature = 0, sysfan_temperature = 0; - cpufan_control = FAN_CRUISE_CONTROL_DISABLED; - get_option(&cpufan_control, "cpufan_cruise_control"); - cpufan_speed = FAN_SPEED_5625; - get_option(&cpufan_speed, "cpufan_speed"); + cpufan_control = get_int_option("cpufan_cruise_control", FAN_CRUISE_CONTROL_DISABLED); + cpufan_speed = get_int_option("cpufan_speed", FAN_SPEED_5625); - sysfan_control = FAN_CRUISE_CONTROL_DISABLED; - get_option(&sysfan_control, "sysfan_cruise_control"); - sysfan_speed = FAN_SPEED_5625; - get_option(&sysfan_speed, "sysfan_speed"); + sysfan_control = get_int_option("sysfan_cruise_control", FAN_CRUISE_CONTROL_DISABLED); + sysfan_speed = get_int_option("sysfan_speed", FAN_SPEED_5625); nuvoton_hwm_select_bank(hwm_base, 0); pnp_write_hwm5_index(hwm_base, 0x59, 0x20); /* Diode Selection */