diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-02-25 15:24:14 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-27 00:56:14 +0000 |
| commit | 331de6dbdf9b024d4c3f6e183df868d3f7cabac2 (patch) | |
| tree | b74b3a5fa64138b7e9e5fce9011d6963649a176b /board | |
| parent | 4baea4e432c476e66d1defb81391ce982e3cdfd8 (diff) | |
| download | chrome-ec-331de6dbdf9b024d4c3f6e183df868d3f7cabac2.tar.gz | |
zork: Move fan into variant_trembyle.c
BUG=b:147297680
BRANCH=none
TEST=none
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: Icc77e0d27db794b1aed0d65c7d30de3ccc3747ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2071391
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/dalboz/board.c | 15 | ||||
| -rw-r--r-- | board/dalboz/board.h | 7 | ||||
| -rw-r--r-- | board/dalboz/gpio.inc | 2 |
3 files changed, 0 insertions, 24 deletions
diff --git a/board/dalboz/board.c b/board/dalboz/board.c index c31cd4cee2..0426545204 100644 --- a/board/dalboz/board.c +++ b/board/dalboz/board.c @@ -150,20 +150,5 @@ const struct pwm_t pwm_channels[] = { .flags = PWM_CONFIG_DSLEEP, .freq = 100, }, - [PWM_CH_FAN] = { - .channel = 2, - .flags = PWM_CONFIG_OPEN_DRAIN, - .freq = 25000, - }, }; BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); - -/* 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); diff --git a/board/dalboz/board.h b/board/dalboz/board.h index b0b31d475d..a78beb8058 100644 --- a/board/dalboz/board.h +++ b/board/dalboz/board.h @@ -71,15 +71,8 @@ enum battery_type { BATTERY_TYPE_COUNT, }; -enum mft_channel { - MFT_CH_0 = 0, - /* Number of MFT channels */ - MFT_CH_COUNT, -}; - enum pwm_channel { PWM_CH_KBLIGHT = 0, - PWM_CH_FAN, PWM_CH_COUNT }; diff --git a/board/dalboz/gpio.inc b/board/dalboz/gpio.inc index 5b55cd7125..fd9efe7816 100644 --- a/board/dalboz/gpio.inc +++ b/board/dalboz/gpio.inc @@ -118,9 +118,7 @@ ALTERNATE(PIN_MASK(B, BIT(2) | BIT(3)), 0, MODULE_I2C, 0) /* I2C7 */ ALTERNATE(PIN_MASK(4, BIT(2) | BIT(3)), 0, MODULE_ADC, 0) /* ADC2, ADC3 Temp Sensors */ ALTERNATE(PIN_MASK(C, BIT(3)), 0, MODULE_PWM, 0) /* PWM0 LED */ -ALTERNATE(PIN_MASK(C, BIT(4)), 0, MODULE_PWM, 0) /* PWM2 - EC_FAN_PWM */ ALTERNATE(PIN_MASK(8, BIT(0)), 0, MODULE_PWM, 0) /* PWM3 KB Backlight */ -ALTERNATE(PIN_MASK(4, BIT(0)), 0, MODULE_PWM, 0) /* TA1 - EC_FAN_SPEED */ ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT) /* KSI_00-01 */ ALTERNATE(PIN_MASK(2, 0xFC), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT) /* KSI_02-07 */ |