diff options
Diffstat (limited to 'baseboard')
-rw-r--r-- | baseboard/intelrvp/baseboard.c | 6 | ||||
-rw-r--r-- | baseboard/intelrvp/baseboard.h | 6 | ||||
-rw-r--r-- | baseboard/intelrvp/ite_ec.c | 60 |
3 files changed, 53 insertions, 19 deletions
diff --git a/baseboard/intelrvp/baseboard.c b/baseboard/intelrvp/baseboard.c index c403edc1f9..ccade12082 100644 --- a/baseboard/intelrvp/baseboard.c +++ b/baseboard/intelrvp/baseboard.c @@ -119,9 +119,9 @@ const struct fan_conf fan_conf_0 = { /* Physical fan rpm config */ const struct fan_rpm fan_rpm_0 = { - .rpm_min = 3100, - .rpm_start = 3100, - .rpm_max = 6900, + .rpm_min = BOARD_FAN_MIN_RPM, + .rpm_start = BOARD_FAN_MIN_RPM, + .rpm_max = BOARD_FAN_MAX_RPM, }; /* FAN channels */ diff --git a/baseboard/intelrvp/baseboard.h b/baseboard/intelrvp/baseboard.h index b1535fa401..751b684906 100644 --- a/baseboard/intelrvp/baseboard.h +++ b/baseboard/intelrvp/baseboard.h @@ -132,12 +132,6 @@ #endif /* CONFIG_PECI */ #endif /* CONFIG_TEMP_SENSOR */ -/* Fan features */ -#ifdef CONFIG_FANS - #undef CONFIG_FAN_INIT_SPEED - #define CONFIG_FAN_INIT_SPEED 50 -#endif - /* I2C ports */ #define CONFIG_I2C #define CONFIG_I2C_MASTER diff --git a/baseboard/intelrvp/ite_ec.c b/baseboard/intelrvp/ite_ec.c index 6906510ac6..b5a3547269 100644 --- a/baseboard/intelrvp/ite_ec.c +++ b/baseboard/intelrvp/ite_ec.c @@ -75,14 +75,54 @@ struct keyboard_scan_config keyscan_config = { * [TACH_CH_TACH1A | TACH_CH_TACH1B] */ const struct fan_tach_t fan_tach[] = { - {TACH_CH_NULL, -1, -1, -1}, - {TACH_CH_NULL, -1, -1, -1}, - {TACH_CH_NULL, -1, -1, -1}, - {TACH_CH_NULL, -1, -1, -1}, - {TACH_CH_NULL, -1, -1, -1}, - {TACH_CH_NULL, -1, -1, -1}, - {TACH_CH_NULL, -1, -1, -1}, - {TACH_CH_TACH1A, 2, 50, 30}, + [PWM_HW_CH_DCR0] = { + .ch_tach = TACH_CH_NULL, + .fan_p = -1, + .rpm_re = -1, + .s_duty = -1, + }, + [PWM_HW_CH_DCR1] = { + .ch_tach = TACH_CH_NULL, + .fan_p = -1, + .rpm_re = -1, + .s_duty = -1, + }, + [PWM_HW_CH_DCR2] = { + .ch_tach = TACH_CH_TACH1A, + .fan_p = 2, + .rpm_re = 1, + .s_duty = 1, + }, + [PWM_HW_CH_DCR3] = { + .ch_tach = TACH_CH_NULL, + .fan_p = -1, + .rpm_re = -1, + .s_duty = -1, + }, + [PWM_HW_CH_DCR4] = { + .ch_tach = TACH_CH_NULL, + .fan_p = -1, + .rpm_re = -1, + .s_duty = -1, + }, + [PWM_HW_CH_DCR5] = { + .ch_tach = TACH_CH_NULL, + .fan_p = -1, + .rpm_re = -1, + .s_duty = -1, + }, + [PWM_HW_CH_DCR6] = { + .ch_tach = TACH_CH_NULL, + .fan_p = -1, + .rpm_re = -1, + .s_duty = -1, + }, + [PWM_HW_CH_DCR7] = { + .ch_tach = TACH_CH_NULL, + .fan_p = -1, + .rpm_re = -1, + .s_duty = -1, + }, }; BUILD_ASSERT(ARRAY_SIZE(fan_tach) == PWM_HW_CH_TOTAL); @@ -90,9 +130,9 @@ BUILD_ASSERT(ARRAY_SIZE(fan_tach) == PWM_HW_CH_TOTAL); const struct pwm_t pwm_channels[] = { [PWM_CH_FAN] = { .channel = PWM_HW_CH_DCR2, - .flags = PWM_CONFIG_ACTIVE_LOW, + .flags = PWM_CONFIG_HAS_RPM_MODE, .freq_hz = 30000, - .pcfsr_sel = PWM_PRESCALER_C4, + .pcfsr_sel = PWM_PRESCALER_C7, }, }; BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); |