diff options
| author | Jongpil Jung <jongpil19.jung@samsung.com> | 2017-11-16 15:32:41 +0900 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-21 21:36:14 -0800 |
| commit | 46c0695dcad23e24d18b9612904d0fb931314da4 (patch) | |
| tree | bd7183ac79f97e8e5c762f4eeae6b18b631bf6f5 | |
| parent | 1e855ebfcf74bb9a05d9f3cbefa4d6488dc41e1b (diff) | |
| download | chrome-ec-46c0695dcad23e24d18b9612904d0fb931314da4.tar.gz | |
nautilus: remove als.
nautilus doesn't have als. So, we need to remove als code in ec firmware.
BUG=b:69389497
BRANCH=none
TEST=build/flash nautilus rev1, power on and boot ok.
check ec console log. There is no als initialization.
Change-Id: I99465fb59090c7d370cb4a28f3500159a6fcb77e
Signed-off-by: Jongpil Jung <jongpil19.jung@samsung.com>
Reviewed-on: https://chromium-review.googlesource.com/773764
Commit-Ready: Jongpil Jung <jongpil19.jung@samsung.corp-partner.google.com>
Tested-by: Jongpil Jung <jongpil19.jung@samsung.corp-partner.google.com>
Reviewed-by: Philip Chen <philipchen@chromium.org>
| -rw-r--r-- | board/nautilus/board.c | 9 | ||||
| -rw-r--r-- | board/nautilus/board.h | 9 | ||||
| -rw-r--r-- | board/nautilus/ec.tasklist | 1 | ||||
| -rw-r--r-- | board/nautilus/gpio.inc | 3 |
4 files changed, 0 insertions, 22 deletions
diff --git a/board/nautilus/board.c b/board/nautilus/board.c index fa588fc32c..90951f793b 100644 --- a/board/nautilus/board.c +++ b/board/nautilus/board.c @@ -7,7 +7,6 @@ #include "adc.h" #include "adc_chip.h" -#include "als.h" #include "bd99992gw.h" #include "board_config.h" #include "button.h" @@ -18,7 +17,6 @@ #include "chipset.h" #include "console.h" #include "driver/accelgyro_bmi160.h" -#include "driver/als_opt3001.h" #include "driver/baro_bmp280.h" #include "driver/tcpm/ps8xxx.h" #include "driver/tcpm/tcpci.h" @@ -457,13 +455,6 @@ const struct temp_sensor_t temp_sensors[] = { }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); -/* ALS instances. Must be in same order as enum als_id. */ -struct als_t als[] = { - /* TODO(crosbug.com/p/61098): verify attenuation_factor */ - {"TI", opt3001_init, opt3001_read_lux, 5}, -}; -BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT); - const struct button_config *recovery_buttons[] = { &buttons[BUTTON_VOLUME_DOWN], &buttons[BUTTON_VOLUME_UP], diff --git a/board/nautilus/board.h b/board/nautilus/board.h index 311797aa54..46de5511ec 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -100,9 +100,6 @@ #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE /* Sensor */ -#define CONFIG_ALS -#define CONFIG_ALS_OPT3001 -#define OPT3001_I2C_ADDR OPT3001_I2C_ADDR1 #define CONFIG_TEMP_SENSOR #define CONFIG_TEMP_SENSOR_BD99992GW /* TODO(crosbug.com/p/61098): Is this the correct thermistor? */ @@ -162,7 +159,6 @@ /* I2C ports */ #define I2C_PORT_TCPC0 NPCX_I2C_PORT0_0 #define I2C_PORT_TCPC1 NPCX_I2C_PORT0_1 -#define I2C_PORT_ALS NPCX_I2C_PORT0_1 #define I2C_PORT_USB_CHARGER_1 NPCX_I2C_PORT0_1 #define I2C_PORT_USB_CHARGER_0 NPCX_I2C_PORT1 #define I2C_PORT_CHARGER NPCX_I2C_PORT1 @@ -203,11 +199,6 @@ enum temp_sensor_id { TEMP_SENSOR_COUNT }; -enum als_id { - ALS_OPT3001, - ALS_COUNT -}; - /* * Motion sensors: * When reading through IO memory is set up for sensors (LPC is used), diff --git a/board/nautilus/ec.tasklist b/board/nautilus/ec.tasklist index 13c29388c8..0ef0783898 100644 --- a/board/nautilus/ec.tasklist +++ b/board/nautilus/ec.tasklist @@ -22,7 +22,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(ALS, als_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \ diff --git a/board/nautilus/gpio.inc b/board/nautilus/gpio.inc index af2638d561..b05199aba0 100644 --- a/board/nautilus/gpio.inc +++ b/board/nautilus/gpio.inc @@ -59,9 +59,6 @@ GPIO(PCH_SLP_S0_L, PIN(7, 5), GPIO_INPUT) /* NC pins */ GPIO(GPIOD2_NC, PIN(D, 2), GPIO_INPUT | GPIO_PULL_UP) -/* Sensor interrupts, not implemented yet */ -GPIO(ALS_INT_L, PIN(2, 5), GPIO_INPUT) - /* TODO(b/35585396): Make use of these GPIOs */ GPIO(PP1800_DX_SENSOR, PIN(E, 7), GPIO_OUTPUT) |