diff options
-rw-r--r-- | baseboard/volteer/baseboard.h | 5 | ||||
-rw-r--r-- | board/halvor/board.h | 1 | ||||
-rw-r--r-- | board/halvor/gpio.inc | 1 | ||||
-rw-r--r-- | board/halvor/sensors.c | 14 | ||||
-rw-r--r-- | board/malefor/board.c | 15 | ||||
-rw-r--r-- | board/malefor/board.h | 1 | ||||
-rw-r--r-- | board/malefor/gpio.inc | 1 | ||||
-rw-r--r-- | board/terrador/board.h | 1 | ||||
-rw-r--r-- | board/terrador/gpio.inc | 1 | ||||
-rw-r--r-- | board/terrador/sensors.c | 14 | ||||
-rw-r--r-- | board/trondo/board.h | 1 | ||||
-rw-r--r-- | board/trondo/gpio.inc | 1 | ||||
-rw-r--r-- | board/trondo/sensors.c | 14 | ||||
-rw-r--r-- | board/volteer/board.h | 1 | ||||
-rw-r--r-- | board/volteer/gpio.inc | 1 | ||||
-rw-r--r-- | board/volteer/sensors.c | 14 | ||||
-rw-r--r-- | board/voxel/board.h | 1 | ||||
-rw-r--r-- | board/voxel/gpio.inc | 1 | ||||
-rw-r--r-- | board/voxel/sensors.c | 14 |
19 files changed, 0 insertions, 102 deletions
diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index 7a5ba2ced8..54554feeb3 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -85,11 +85,6 @@ #define CONFIG_CMD_ACCELS #define CONFIG_CMD_ACCEL_INFO -/* Camera VSYNC */ -#define CONFIG_SYNC -#define CONFIG_SYNC_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(VSYNC) - /* Thermal features */ #define CONFIG_FANS FAN_CH_COUNT #define CONFIG_TEMP_SENSOR diff --git a/board/halvor/board.h b/board/halvor/board.h index ba2d6ac952..bb7aab421a 100644 --- a/board/halvor/board.h +++ b/board/halvor/board.h @@ -139,7 +139,6 @@ enum sensor_id { LID_ACCEL = 0, CLEAR_ALS, RGB_ALS, - VSYNC, SENSOR_COUNT, }; diff --git a/board/halvor/gpio.inc b/board/halvor/gpio.inc index e02e7adf2c..9bb5629d09 100644 --- a/board/halvor/gpio.inc +++ b/board/halvor/gpio.inc @@ -30,7 +30,6 @@ GPIO_INT(DSW_PWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_EC_ALL_SYS_PWRGD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt) /* Sensor Interrupts */ -GPIO_INT(EC_CAM_VSYN_SLP_S0IX, PIN(7, 2), GPIO_INT_RISING, sync_interrupt) GPIO_INT(EC_ALS_RGB_INT_L, PIN(D, 4), GPIO_INT_FALLING, tcs3400_interrupt) GPIO_INT(TABLET_MODE_L, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr) diff --git a/board/halvor/sensors.c b/board/halvor/sensors.c index e13d7fd57e..b2795ee904 100644 --- a/board/halvor/sensors.c +++ b/board/halvor/sensors.c @@ -151,18 +151,6 @@ struct motion_sensor_t motion_sensors[] = { .rot_standard_ref = NULL, .default_range = 0x10000, /* scale = 1x, uscale = 0 */ }, - - [VSYNC] = { - .name = "Camera VSYNC", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_GPIO, - .type = MOTIONSENSE_TYPE_SYNC, - .location = MOTIONSENSE_LOC_CAMERA, - .drv = &sync_drv, - .default_range = 0, - .min_frequency = 0, - .max_frequency = 1, - }, }; unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); @@ -176,8 +164,6 @@ static void baseboard_sensors_init(void) { /* Note - BMA253 interrupt unused by EC */ - /* Enable gpio interrupt for camera vsync */ - gpio_enable_interrupt(GPIO_EC_CAM_VSYN_SLP_S0IX); /* Enable interrupt for the TCS3400 color light sensor */ gpio_enable_interrupt(GPIO_EC_ALS_RGB_INT_L); } diff --git a/board/malefor/board.c b/board/malefor/board.c index 4211bdfabc..43fe41e27b 100644 --- a/board/malefor/board.c +++ b/board/malefor/board.c @@ -46,9 +46,6 @@ static void board_init(void) gpio_set_flags(GPIO_EC_IMU_INT_L, GPIO_INPUT | GPIO_PULL_DOWN); } - /* Enable gpio interrupt for camera vsync */ - gpio_enable_interrupt(GPIO_EC_CAM_VSYN_SLP_S0IX); - /* * TODO: b/154447182 - Malefor will control power LED and battery LED * independently, and keep the max brightness of power LED and battery @@ -179,18 +176,6 @@ struct motion_sensor_t motion_sensors[] = { .min_frequency = LSM6DSM_ODR_MIN_VAL, .max_frequency = LSM6DSM_ODR_MAX_VAL, }, - - [VSYNC] = { - .name = "Camera VSYNC", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_GPIO, - .type = MOTIONSENSE_TYPE_SYNC, - .location = MOTIONSENSE_LOC_CAMERA, - .drv = &sync_drv, - .default_range = 0, - .min_frequency = 0, - .max_frequency = 1, - }, }; unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); diff --git a/board/malefor/board.h b/board/malefor/board.h index 1ec6632a3d..1104f6e80f 100644 --- a/board/malefor/board.h +++ b/board/malefor/board.h @@ -131,7 +131,6 @@ enum sensor_id { LID_ACCEL = 0, BASE_ACCEL, BASE_GYRO, - VSYNC, SENSOR_COUNT, }; diff --git a/board/malefor/gpio.inc b/board/malefor/gpio.inc index 5bc55f95c3..e1f356384e 100644 --- a/board/malefor/gpio.inc +++ b/board/malefor/gpio.inc @@ -30,7 +30,6 @@ GPIO_INT(DSW_PWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_EC_ALL_SYS_PWRGD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt) /* Sensor Interrupts */ -GPIO_INT(EC_CAM_VSYN_SLP_S0IX, PIN(7, 2), GPIO_INT_RISING, sync_interrupt) GPIO_INT(EC_IMU_INT_L, PIN(5, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, lsm6dsm_interrupt) GPIO_INT(TABLET_MODE_L, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr) diff --git a/board/terrador/board.h b/board/terrador/board.h index 48cc6308ea..06c48ad427 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -152,7 +152,6 @@ enum sensor_id { BASE_GYRO, CLEAR_ALS, RGB_ALS, - VSYNC, SENSOR_COUNT, }; diff --git a/board/terrador/gpio.inc b/board/terrador/gpio.inc index a6ef65357c..49d3870ace 100644 --- a/board/terrador/gpio.inc +++ b/board/terrador/gpio.inc @@ -31,7 +31,6 @@ GPIO_INT(PG_EC_ALL_SYS_PWRGD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt /* Sensor Interrupts */ GPIO_INT(EC_IMU_INT_L, PIN(5, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, bmi260_interrupt) -GPIO_INT(EC_CAM_VSYN_SLP_S0IX, PIN(7, 2), GPIO_INT_RISING, sync_interrupt) GPIO_INT(EC_ALS_RGB_INT_L, PIN(D, 4), GPIO_INT_FALLING, tcs3400_interrupt) GPIO_INT(TABLET_MODE_L, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr) diff --git a/board/terrador/sensors.c b/board/terrador/sensors.c index 1d192d4289..0a8b051699 100644 --- a/board/terrador/sensors.c +++ b/board/terrador/sensors.c @@ -205,18 +205,6 @@ struct motion_sensor_t motion_sensors[] = { .rot_standard_ref = NULL, .default_range = 0x10000, /* scale = 1x, uscale = 0 */ }, - - [VSYNC] = { - .name = "Camera VSYNC", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_GPIO, - .type = MOTIONSENSE_TYPE_SYNC, - .location = MOTIONSENSE_LOC_CAMERA, - .drv = &sync_drv, - .default_range = 0, - .min_frequency = 0, - .max_frequency = 1, - }, }; unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); @@ -230,8 +218,6 @@ static void baseboard_sensors_init(void) { /* Note - BMA253 interrupt unused by EC */ - /* Enable gpio interrupt for camera vsync */ - gpio_enable_interrupt(GPIO_EC_CAM_VSYN_SLP_S0IX); /* Enable interrupt for the TCS3400 color light sensor */ gpio_enable_interrupt(GPIO_EC_ALS_RGB_INT_L); /* Enable interrupt for the BMI260 accel/gyro sensor */ diff --git a/board/trondo/board.h b/board/trondo/board.h index 1cbdb7bf0f..bff0da6df9 100644 --- a/board/trondo/board.h +++ b/board/trondo/board.h @@ -149,7 +149,6 @@ enum sensor_id { BASE_GYRO, CLEAR_ALS, RGB_ALS, - VSYNC, SENSOR_COUNT, }; diff --git a/board/trondo/gpio.inc b/board/trondo/gpio.inc index 2bbc1255a6..9d54f66257 100644 --- a/board/trondo/gpio.inc +++ b/board/trondo/gpio.inc @@ -31,7 +31,6 @@ GPIO_INT(PG_EC_ALL_SYS_PWRGD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt /* Sensor Interrupts */ GPIO_INT(EC_IMU_INT_L, PIN(5, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, bmi260_interrupt) -GPIO_INT(EC_CAM_VSYN_SLP_S0IX, PIN(7, 2), GPIO_INT_RISING, sync_interrupt) GPIO_INT(EC_ALS_RGB_INT_L, PIN(D, 4), GPIO_INT_FALLING, tcs3400_interrupt) GPIO_INT(TABLET_MODE_L, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr) diff --git a/board/trondo/sensors.c b/board/trondo/sensors.c index f59c199e07..e9169abaae 100644 --- a/board/trondo/sensors.c +++ b/board/trondo/sensors.c @@ -208,18 +208,6 @@ struct motion_sensor_t motion_sensors[] = { .rot_standard_ref = NULL, .default_range = 0x10000, /* scale = 1x, uscale = 0 */ }, - - [VSYNC] = { - .name = "Camera VSYNC", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_GPIO, - .type = MOTIONSENSE_TYPE_SYNC, - .location = MOTIONSENSE_LOC_CAMERA, - .drv = &sync_drv, - .default_range = 0, - .min_frequency = 0, - .max_frequency = 1, - }, }; unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); @@ -233,8 +221,6 @@ static void baseboard_sensors_init(void) { /* Note - BMA253 interrupt unused by EC */ - /* Enable gpio interrupt for camera vsync */ - gpio_enable_interrupt(GPIO_EC_CAM_VSYN_SLP_S0IX); /* Enable interrupt for the TCS3400 color light sensor */ gpio_enable_interrupt(GPIO_EC_ALS_RGB_INT_L); /* Enable interrupt for the BMI260 accel/gyro sensor */ diff --git a/board/volteer/board.h b/board/volteer/board.h index ee548c2c72..9b09dab9c0 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -152,7 +152,6 @@ enum sensor_id { BASE_GYRO, CLEAR_ALS, RGB_ALS, - VSYNC, SENSOR_COUNT, }; diff --git a/board/volteer/gpio.inc b/board/volteer/gpio.inc index 5bd026f168..21484702d0 100644 --- a/board/volteer/gpio.inc +++ b/board/volteer/gpio.inc @@ -31,7 +31,6 @@ GPIO_INT(PG_EC_ALL_SYS_PWRGD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt /* Sensor Interrupts */ GPIO_INT(EC_IMU_INT_L, PIN(5, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, bmi260_interrupt) -GPIO_INT(EC_CAM_VSYN_SLP_S0IX, PIN(7, 2), GPIO_INT_RISING, sync_interrupt) GPIO_INT(EC_ALS_RGB_INT_L, PIN(D, 4), GPIO_INT_FALLING, tcs3400_interrupt) GPIO_INT(TABLET_MODE_L, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr) diff --git a/board/volteer/sensors.c b/board/volteer/sensors.c index 1d192d4289..0a8b051699 100644 --- a/board/volteer/sensors.c +++ b/board/volteer/sensors.c @@ -205,18 +205,6 @@ struct motion_sensor_t motion_sensors[] = { .rot_standard_ref = NULL, .default_range = 0x10000, /* scale = 1x, uscale = 0 */ }, - - [VSYNC] = { - .name = "Camera VSYNC", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_GPIO, - .type = MOTIONSENSE_TYPE_SYNC, - .location = MOTIONSENSE_LOC_CAMERA, - .drv = &sync_drv, - .default_range = 0, - .min_frequency = 0, - .max_frequency = 1, - }, }; unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); @@ -230,8 +218,6 @@ static void baseboard_sensors_init(void) { /* Note - BMA253 interrupt unused by EC */ - /* Enable gpio interrupt for camera vsync */ - gpio_enable_interrupt(GPIO_EC_CAM_VSYN_SLP_S0IX); /* Enable interrupt for the TCS3400 color light sensor */ gpio_enable_interrupt(GPIO_EC_ALS_RGB_INT_L); /* Enable interrupt for the BMI260 accel/gyro sensor */ diff --git a/board/voxel/board.h b/board/voxel/board.h index 48cc6308ea..06c48ad427 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -152,7 +152,6 @@ enum sensor_id { BASE_GYRO, CLEAR_ALS, RGB_ALS, - VSYNC, SENSOR_COUNT, }; diff --git a/board/voxel/gpio.inc b/board/voxel/gpio.inc index a6ef65357c..49d3870ace 100644 --- a/board/voxel/gpio.inc +++ b/board/voxel/gpio.inc @@ -31,7 +31,6 @@ GPIO_INT(PG_EC_ALL_SYS_PWRGD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt /* Sensor Interrupts */ GPIO_INT(EC_IMU_INT_L, PIN(5, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, bmi260_interrupt) -GPIO_INT(EC_CAM_VSYN_SLP_S0IX, PIN(7, 2), GPIO_INT_RISING, sync_interrupt) GPIO_INT(EC_ALS_RGB_INT_L, PIN(D, 4), GPIO_INT_FALLING, tcs3400_interrupt) GPIO_INT(TABLET_MODE_L, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr) diff --git a/board/voxel/sensors.c b/board/voxel/sensors.c index 1d192d4289..0a8b051699 100644 --- a/board/voxel/sensors.c +++ b/board/voxel/sensors.c @@ -205,18 +205,6 @@ struct motion_sensor_t motion_sensors[] = { .rot_standard_ref = NULL, .default_range = 0x10000, /* scale = 1x, uscale = 0 */ }, - - [VSYNC] = { - .name = "Camera VSYNC", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_GPIO, - .type = MOTIONSENSE_TYPE_SYNC, - .location = MOTIONSENSE_LOC_CAMERA, - .drv = &sync_drv, - .default_range = 0, - .min_frequency = 0, - .max_frequency = 1, - }, }; unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); @@ -230,8 +218,6 @@ static void baseboard_sensors_init(void) { /* Note - BMA253 interrupt unused by EC */ - /* Enable gpio interrupt for camera vsync */ - gpio_enable_interrupt(GPIO_EC_CAM_VSYN_SLP_S0IX); /* Enable interrupt for the TCS3400 color light sensor */ gpio_enable_interrupt(GPIO_EC_ALS_RGB_INT_L); /* Enable interrupt for the BMI260 accel/gyro sensor */ |