summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/aleena/board.c2
-rw-r--r--board/dalboz/board.c4
-rw-r--r--board/dirinboz/board.c4
-rw-r--r--board/elm/board.c2
-rw-r--r--board/ezkinil/board.c4
-rw-r--r--board/gumboz/board.c4
-rw-r--r--board/mchpevb1/board.c6
-rw-r--r--board/mchpevb1/ec.tasklist4
-rw-r--r--board/morphius/board.c4
-rw-r--r--board/nuwani/board.c4
-rw-r--r--board/oak/board.c2
-rw-r--r--board/rainier/board.c2
-rw-r--r--board/scarlet/board.c2
-rw-r--r--board/shuboz/board.c4
-rw-r--r--board/treeya/board.c4
-rw-r--r--board/trembyle/board.c4
-rw-r--r--board/vilboz/board.c4
-rw-r--r--board/woomax/board.c4
18 files changed, 2 insertions, 62 deletions
diff --git a/board/aleena/board.c b/board/aleena/board.c
index e78d9773a9..ded6cbf698 100644
--- a/board/aleena/board.c
+++ b/board/aleena/board.c
@@ -54,7 +54,6 @@ const struct pwm_t pwm_channels[] = {
};
BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
-#ifdef HAS_TASK_MOTIONSENSE
/* Motion sensors */
static struct mutex icm426xx_mutex;
@@ -176,7 +175,6 @@ void board_update_sensor_config_from_sku(void)
GPIO_INPUT | GPIO_PULL_DOWN);
}
}
-#endif
static void board_kblight_init(void)
{
diff --git a/board/dalboz/board.c b/board/dalboz/board.c
index b40c374b80..28114fb361 100644
--- a/board/dalboz/board.c
+++ b/board/dalboz/board.c
@@ -75,8 +75,6 @@ void hdmi_hpd_interrupt(enum gpio_signal signal)
#include "gpio_list.h"
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -176,8 +174,6 @@ struct motion_sensor_t motion_sensors[] = {
unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* HAS_TASK_MOTIONSENSE */
-
/* These IO expander GPIOs vary with DB option. */
enum gpio_signal IOEX_USB_A1_RETIMER_EN = IOEX_USB_A1_RETIMER_EN_OPT1;
enum gpio_signal IOEX_USB_A1_CHARGE_EN_DB_L = IOEX_USB_A1_CHARGE_EN_DB_L_OPT1;
diff --git a/board/dirinboz/board.c b/board/dirinboz/board.c
index 50f010f3cf..135b84af90 100644
--- a/board/dirinboz/board.c
+++ b/board/dirinboz/board.c
@@ -44,8 +44,6 @@ int I2C_PORT_BATTERY = I2C_PORT_BATTERY_V1;
#include "gpio_list.h"
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -145,8 +143,6 @@ struct motion_sensor_t motion_sensors[] = {
unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* HAS_TASK_MOTIONSENSE */
-
/*****************************************************************************
* Retimers
*/
diff --git a/board/elm/board.c b/board/elm/board.c
index accb1ea8a3..8a6e2940be 100644
--- a/board/elm/board.c
+++ b/board/elm/board.c
@@ -448,7 +448,6 @@ static void board_chipset_suspend(void)
}
DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT);
-#ifdef HAS_TASK_MOTIONSENSE
/* Motion sensors */
/* Mutexes */
static struct mutex g_kx022_mutex[2];
@@ -526,7 +525,6 @@ void lid_angle_peripheral_enable(int enable)
/* enable/disable touchpad */
gpio_set_level(GPIO_EN_TP_INT_L, !enable);
}
-#endif /* defined(HAS_TASK_MOTIONSENSE) */
uint16_t tcpc_get_alert_status(void)
{
diff --git a/board/ezkinil/board.c b/board/ezkinil/board.c
index 9d7a0a9a58..b27e8cf248 100644
--- a/board/ezkinil/board.c
+++ b/board/ezkinil/board.c
@@ -43,8 +43,6 @@
static int board_ver;
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -194,8 +192,6 @@ struct motion_sensor_t icm426xx_base_gyro = {
.max_frequency = ICM426XX_GYRO_MAX_FREQ,
};
-#endif /* HAS_TASK_MOTIONSENSE */
-
const struct power_signal_info power_signal_list[] = {
[X86_SLP_S3_N] = {
.gpio = GPIO_PCH_SLP_S3_L,
diff --git a/board/gumboz/board.c b/board/gumboz/board.c
index 1b477fb56d..0abf11e8d1 100644
--- a/board/gumboz/board.c
+++ b/board/gumboz/board.c
@@ -41,8 +41,6 @@ int I2C_PORT_BATTERY = I2C_PORT_BATTERY_V1;
#include "gpio_list.h"
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -147,8 +145,6 @@ struct motion_sensor_t motion_sensors[] = {
unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* HAS_TASK_MOTIONSENSE */
-
/*****************************************************************************
* Retimers
*/
diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c
index b80db787cd..f9c74c89fe 100644
--- a/board/mchpevb1/board.c
+++ b/board/mchpevb1/board.c
@@ -88,10 +88,8 @@ static int smart_batt_temp;
static int ds1624_temp;
static int sb_temp(int idx, int *temp_ptr);
static int ds1624_get_val(int idx, int *temp_ptr);
-#ifdef HAS_TASK_MOTIONSENSE
static void board_spi_enable(void);
static void board_spi_disable(void);
-#endif
#ifdef CONFIG_BOARD_PRE_INIT
/*
@@ -561,13 +559,11 @@ static void board_init(void)
/* Provide AC status to the PCH */
gpio_set_level(GPIO_PCH_ACOK, extpower_is_present());
-#ifdef HAS_TASK_MOTIONSENSE
if (system_jumped_late() &&
chipset_in_state(CHIPSET_STATE_ON)) {
trace0(0, BRD, 0, "board_init: S0 call board_spi_enable");
board_spi_enable();
}
-#endif
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
@@ -906,7 +902,6 @@ static void board_one_sec(void)
}
DECLARE_HOOK(HOOK_SECOND, board_one_sec, HOOK_PRIO_DEFAULT);
-#ifdef HAS_TASK_MOTIONSENSE
/* Motion sensors */
static struct mutex g_base_mutex;
@@ -1018,7 +1013,6 @@ static void board_spi_disable(void)
}
DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_spi_disable,
MOTION_SENSE_HOOK_PRIO + 1);
-#endif /* defined(HAS_TASK_MOTIONSENSE) */
#ifdef MEC1701_EVB_TACH_TEST /* PWM/TACH test */
void tach0_isr(void)
diff --git a/board/mchpevb1/ec.tasklist b/board/mchpevb1/ec.tasklist
index cdfdd45163..6fcd5faa98 100644
--- a/board/mchpevb1/ec.tasklist
+++ b/board/mchpevb1/ec.tasklist
@@ -9,10 +9,10 @@
#define CONFIG_TASK_LIST \
TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \
TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \
- TASK_ALWAYS(MOTIONSENSE, motion_sense_task, NULL, LARGER_TASK_STACK_SIZE) \
+ TASK_ALWAYS(MOTIONSENSE, motion_sense_task, NULL, LARGER_TASK_STACK_SIZE) \
TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
TASK_ALWAYS(POWERBTN, power_button_task, NULL, LARGER_TASK_STACK_SIZE) \
- TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE)
+ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE)
diff --git a/board/morphius/board.c b/board/morphius/board.c
index 4593d8a27e..137fc69af9 100644
--- a/board/morphius/board.c
+++ b/board/morphius/board.c
@@ -56,8 +56,6 @@ static void board_gmr_tablet_switch_isr(enum gpio_signal signal);
static bool support_aoz_ppc;
static bool ignore_c1_dp;
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -205,8 +203,6 @@ struct motion_sensor_t icm426xx_base_gyro = {
.max_frequency = ICM426XX_GYRO_MAX_FREQ,
};
-#endif /* HAS_TASK_MOTIONSENSE */
-
const struct pwm_t pwm_channels[] = {
[PWM_CH_KBLIGHT] = {
.channel = 3,
diff --git a/board/nuwani/board.c b/board/nuwani/board.c
index 3b64396976..5d5f5f842d 100644
--- a/board/nuwani/board.c
+++ b/board/nuwani/board.c
@@ -40,8 +40,6 @@ const struct i2c_port_t i2c_ports[] = {
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex_1;
static struct mutex g_base_mutex_1;
@@ -189,5 +187,3 @@ void board_bmi160_lsm6dsm_interrupt(enum gpio_signal signal)
else
bmi160_interrupt(signal);
}
-
-#endif
diff --git a/board/oak/board.c b/board/oak/board.c
index 7a2d9c5698..9d8abb52ab 100644
--- a/board/oak/board.c
+++ b/board/oak/board.c
@@ -61,10 +61,8 @@
void pd_mcu_interrupt(enum gpio_signal signal)
{
-#ifdef HAS_TASK_PDCMD
/* Exchange status with PD MCU to determine interrupt cause */
host_command_pd_send_status(0);
-#endif
}
#if BOARD_REV >= OAK_REV4
diff --git a/board/rainier/board.c b/board/rainier/board.c
index 3fa159a8f0..bf718fc425 100644
--- a/board/rainier/board.c
+++ b/board/rainier/board.c
@@ -347,7 +347,6 @@ int board_get_version(void)
}
/* Motion sensors */
-#ifdef HAS_TASK_MOTIONSENSE
/* Mutexes */
static struct mutex g_base_mutex;
@@ -430,7 +429,6 @@ struct motion_sensor_t motion_sensors[] = {
},
};
const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* defined(HAS_TASK_MOTIONSENSE) */
int board_allow_i2c_passthru(int port)
{
diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index 4544aa551c..403beb768b 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -383,7 +383,6 @@ int board_get_version(void)
}
/* Motion sensors */
-#ifdef HAS_TASK_MOTIONSENSE
/* Mutexes */
static struct mutex g_base_mutex;
@@ -454,7 +453,6 @@ struct motion_sensor_t motion_sensors[] = {
},
};
const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* defined(HAS_TASK_MOTIONSENSE) */
int board_allow_i2c_passthru(int port)
{
diff --git a/board/shuboz/board.c b/board/shuboz/board.c
index cf53354e3e..d9116bfd0b 100644
--- a/board/shuboz/board.c
+++ b/board/shuboz/board.c
@@ -43,8 +43,6 @@ int I2C_PORT_BATTERY = I2C_PORT_BATTERY_V1;
#include "gpio_list.h"
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -145,8 +143,6 @@ struct motion_sensor_t motion_sensors[] = {
unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* HAS_TASK_MOTIONSENSE */
-
/*****************************************************************************
* Board suspend / resume
*/
diff --git a/board/treeya/board.c b/board/treeya/board.c
index c796bf43a0..504d171c33 100644
--- a/board/treeya/board.c
+++ b/board/treeya/board.c
@@ -40,8 +40,6 @@ const struct i2c_port_t i2c_ports[] = {
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex_1;
static struct mutex g_base_mutex_1;
@@ -189,5 +187,3 @@ void board_bmi160_lsm6dsm_interrupt(enum gpio_signal signal)
else
bmi160_interrupt(signal);
}
-
-#endif
diff --git a/board/trembyle/board.c b/board/trembyle/board.c
index 5c92a9a5b6..153ae1be6e 100644
--- a/board/trembyle/board.c
+++ b/board/trembyle/board.c
@@ -41,8 +41,6 @@
#define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ## args)
#define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ## args)
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -129,8 +127,6 @@ struct motion_sensor_t motion_sensors[] = {
unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* HAS_TASK_MOTIONSENSE */
-
const struct power_signal_info power_signal_list[] = {
[X86_SLP_S3_N] = {
.gpio = GPIO_PCH_SLP_S3_L,
diff --git a/board/vilboz/board.c b/board/vilboz/board.c
index 97c2e66ffe..e6e647a386 100644
--- a/board/vilboz/board.c
+++ b/board/vilboz/board.c
@@ -46,8 +46,6 @@ void hdmi_hpd_interrupt(enum gpio_signal signal)
#include "gpio_list.h"
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -153,8 +151,6 @@ struct motion_sensor_t motion_sensors[] = {
unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* HAS_TASK_MOTIONSENSE */
-
/*
* USB C0 port SBU mux use standalone FSUSB42UMX
* chip and it need a board specific driver.
diff --git a/board/woomax/board.c b/board/woomax/board.c
index 26a3901540..1d884de7c5 100644
--- a/board/woomax/board.c
+++ b/board/woomax/board.c
@@ -45,8 +45,6 @@
#define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ## args)
#define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ## args)
-#ifdef HAS_TASK_MOTIONSENSE
-
/* Motion sensors */
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
@@ -146,8 +144,6 @@ struct motion_sensor_t motion_sensors[] = {
unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-#endif /* HAS_TASK_MOTIONSENSE */
-
const struct power_signal_info power_signal_list[] = {
[X86_SLP_S3_N] = {
.gpio = GPIO_PCH_SLP_S3_L,
View Lorry Controller Status