voema: Remove fan function

Remove fan function.

BUG=b:169356808
BRANCH=master
TEST=make buildall succeed.

Signed-off-by: David Huang <david.huang@quanta.corp-partner.google.com>
Change-Id: Id3c0f4f638d09bd10afd1de523c0e458a7413936
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2537526
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>

3 files changed, 4 insertions, 58 deletions

diff --git a/board/voema/board.c b/board/voema/board.c
index 0bc62264e5..2fe9175a31 100644
--- a/board/voema/board.c
+++ b/board/voema/board.c
@@ -22,8 +22,6 @@
 #include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/tusb422.h"
 #include "extpower.h"
-#include "fan.h"
-#include "fan_chip.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "keyboard_raw.h"
@@ -121,36 +119,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,
-	},
-};
-
-/******************************************************************************/
 /* EC thermal management configuration */
 
 /*
@@ -166,8 +134,6 @@ const static struct ec_thermal_config thermal_cpu = {
 	.temp_host_release = {
 		[EC_TEMP_THRESH_HIGH] = C_TO_K(65),
 	},
-	.temp_fan_off = C_TO_K(35),
-	.temp_fan_max = C_TO_K(50),
 };
 
 /*
@@ -189,8 +155,6 @@ const static struct ec_thermal_config thermal_inductor = {
 	.temp_host_release = {
 		[EC_TEMP_THRESH_HIGH] = C_TO_K(65),
 	},
-	.temp_fan_off = C_TO_K(40),
-	.temp_fan_max = C_TO_K(55),
 };
 
 
@@ -203,17 +167,6 @@ struct ec_thermal_config thermal_params[] = {
 BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_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);
-
-/******************************************************************************/
 /* I2C port map configuration */
 const struct i2c_port_t i2c_ports[] = {
 	{
@@ -264,11 +217,6 @@ const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 /******************************************************************************/
 /* PWM configuration */
 const struct pwm_t pwm_channels[] = {
-	[PWM_CH_FAN] = {
-		.channel = 5,
-		.flags = PWM_CONFIG_OPEN_DRAIN,
-		.freq = 25000
-	},
 	[PWM_CH_KBLIGHT] = {
 		.channel = 3,
 		.flags = 0,
diff --git a/board/voema/board.h b/board/voema/board.h
index e57217d07d..a6051d930b 100644
--- a/board/voema/board.h
+++ b/board/voema/board.h
@@ -97,6 +97,7 @@
 /* Volume Button feature */
 
 /* Fan features */
+#undef CONFIG_FANS
 
 /* charger defines */
 #define CONFIG_CHARGER_SENSE_RESISTOR		10
@@ -160,7 +161,6 @@ enum battery_type {
 };
 
 enum pwm_channel {
-	PWM_CH_FAN,
 	PWM_CH_KBLIGHT,
 	PWM_CH_COUNT
 };
diff --git a/board/voema/gpio.inc b/board/voema/gpio.inc
index 86413ce5f4..691512c869 100644
--- a/board/voema/gpio.inc
+++ b/board/voema/gpio.inc
@@ -112,6 +112,9 @@ GPIO(UNUSED_GPIO96,		PIN(9, 6), GPIO_INPUT | GPIO_PULL_UP)
 GPIO(UNUSED_GPIO34,		PIN(3, 4), GPIO_INPUT | GPIO_PULL_UP)
 GPIO(UNUSED_GPIO57,		PIN(5, 7), GPIO_INPUT | GPIO_PULL_UP)
 GPIO(UNUSED_GPIOC2,		PIN(C, 2), GPIO_INPUT | GPIO_PULL_UP)
+GPIO(UNUSED_GPIO61,		PIN(6, 1), GPIO_INPUT | GPIO_PULL_UP)
+GPIO(UNUSED_GPIOB7,		PIN(B, 7), GPIO_INPUT | GPIO_PULL_UP)
+GPIO(UNUSED_GPIO40,		PIN(4, 0), GPIO_INPUT | GPIO_PULL_UP)
 /* Only connected to test points */
 GPIO(EC_KB_BL_EN,		PIN(8, 6), GPIO_INPUT | GPIO_PULL_UP)
 
@@ -151,11 +154,6 @@ ALTERNATE(PIN_MASK(D, BIT(1) | BIT(0)), 0, MODULE_I2C, 0)
 ALTERNATE(PIN_MASK(3, BIT(3) | BIT(6)), 0, MODULE_I2C, 0)                            /* I2C5 */
 ALTERNATE(PIN_MASK(B, BIT(3) | BIT(2)), 0, MODULE_I2C, 0)                            /* I2C7 */
 
-/* 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 */