diff options
| author | David Huang <david.huang@quanta.corp-partner.google.com> | 2020-07-02 16:31:50 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-07 03:25:48 +0000 |
| commit | 1c517d0908ebf272adf176515fc82c4ac5a8647d (patch) | |
| tree | f886ad16c358a356052b34a683340773eff41f98 /board | |
| parent | 032533b3baa78e4c5bf86f4811ecd31083373ad0 (diff) | |
| download | chrome-ec-1c517d0908ebf272adf176515fc82c4ac5a8647d.tar.gz | |
Terrador: remove fan related function.
Terrador is fan less, remove fan function.
BUG=b:151978872
BRANCH=master
TEST=make buildall success.
Signed-off-by: David Huang <david.huang@quanta.corp-partner.google.com>
Change-Id: Iebb74fac4ae60d20ce16073df6539df544ba7fc0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2279151
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/terrador/board.c | 46 | ||||
| -rw-r--r-- | board/terrador/board.h | 2 | ||||
| -rw-r--r-- | board/terrador/gpio.inc | 5 |
3 files changed, 1 insertions, 52 deletions
diff --git a/board/terrador/board.c b/board/terrador/board.c index aa66a66a4c..9d53cdcea7 100644 --- a/board/terrador/board.c +++ b/board/terrador/board.c @@ -81,47 +81,6 @@ __override bool board_is_tbt_usb4_port(int port) } /******************************************************************************/ -/* Physical fans. These are logically separate from pwm_channels. */ - -const struct fan_conf fan_conf_0 = { - .flags = FAN_USE_RPM_MODE, - .ch = MFT_CH_0, /* Use MFT id to control fan */ - .pgood_gpio = -1, - .enable_gpio = GPIO_EN_PP5000_FAN, -}; - -/* - * Fan specs from datasheet: - * Max speed 5900 rpm (+/- 7%), minimum duty cycle 30%. - * Minimum speed not specified by RPM. Set minimum RPM to max speed (with - * margin) x 30%. - * 5900 x 1.07 x 0.30 = 1894, round up to 1900 - */ -const struct fan_rpm fan_rpm_0 = { - .rpm_min = 1900, - .rpm_start = 1900, - .rpm_max = 5900, -}; - -const struct fan_t fans[FAN_CH_COUNT] = { - [FAN_CH_0] = { - .conf = &fan_conf_0, - .rpm = &fan_rpm_0, - }, -}; - -/******************************************************************************/ -/* MFT channels. These are logically separate from pwm_channels. */ -const struct mft_t mft_channels[] = { - [MFT_CH_0] = { - .module = NPCX_MFT_MODULE_1, - .clk_src = TCKC_LFCLK, - .pwm_id = PWM_CH_FAN, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT); - -/******************************************************************************/ /* I2C port map configuration */ const struct i2c_port_t i2c_ports[] = { { @@ -195,11 +154,6 @@ const struct pwm_t pwm_channels[] = { */ .freq = 4800, }, - [PWM_CH_FAN] = { - .channel = 5, - .flags = PWM_CONFIG_OPEN_DRAIN, - .freq = 25000 - }, [PWM_CH_KBLIGHT] = { .channel = 3, .flags = 0, diff --git a/board/terrador/board.h b/board/terrador/board.h index 2cffe84edc..19f437b5af 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -81,6 +81,7 @@ /* Volume Button feature */ /* Fan features */ +#undef CONFIG_FANS /* * Macros for GPIO signals used in common code that don't match the @@ -144,7 +145,6 @@ enum pwm_channel { PWM_CH_LED2_GREEN, PWM_CH_LED3_RED, PWM_CH_LED4_SIDESEL, - PWM_CH_FAN, PWM_CH_KBLIGHT, PWM_CH_COUNT }; diff --git a/board/terrador/gpio.inc b/board/terrador/gpio.inc index b59c2fcea0..e4ba79f457 100644 --- a/board/terrador/gpio.inc +++ b/board/terrador/gpio.inc @@ -157,11 +157,6 @@ ALTERNATE(PIN_MASK(B, BIT(3) | BIT(2)), 0, MODULE_I2C, 0) ALTERNATE(PIN_MASK(6, BIT(0)), 0, MODULE_PWM, 0) /* LED_SIDESEL_4_L */ ALTERNATE(PIN_MASK(C, BIT(2) | BIT(3) | BIT(4)), 0, MODULE_PWM, 0) /* LED_{3,2,1}_L */ -/* Fan signals */ -GPIO(EN_PP5000_FAN, PIN(6, 1), GPIO_OUT_LOW) -ALTERNATE(PIN_MASK(B, BIT(7)), 0, MODULE_PWM, 0) /* FAN_PWM */ -ALTERNATE(PIN_MASK(4, BIT(0)), 0, MODULE_PWM, 0) /* FAN_SPEED_TACH */ - /* Keyboard pins */ #define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP) ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) /* KSI_00-01 */ |