From 6c116f0ffcc2274accd94d7608a685d993f4ef08 Mon Sep 17 00:00:00 2001 From: Ryan Zhang Date: Tue, 8 Mar 2016 14:54:02 +0800 Subject: [PATCH] Lars: Manually Revert "Lars: Add ALS support" - als * revert#315470 has conflict error msg BUG=chrome-os-partner:50730 BRANCH=lars TEST=`make -j buildall` Change-Id: I955916d5ff052820337aac8e59ff38af33655320 Signed-off-by: Ryan Zhang Reviewed-on: https://chromium-review.googlesource.com/331004 Reviewed-by: Shawn N --- board/lars/board.c | 11 +---------- board/lars/board.h | 9 --------- board/lars/ec.tasklist | 1 - board/lars/gpio.inc | 8 ++++---- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/board/lars/board.c b/board/lars/board.c index 929828fb98..6d78d39f5e 100644 --- a/board/lars/board.c +++ b/board/lars/board.c @@ -5,12 +5,10 @@ /* Skylake Chrome Reference Design board-specific configuration */ #include "adc_chip.h" -#include "als.h" #include "charge_manager.h" #include "charge_state.h" #include "charger.h" #include "console.h" -#include "driver/als_isl29035.h" #include "driver/pmic_tps650830.h" #include "driver/temp_sensor/tmp432.h" #include "extpower.h" @@ -71,12 +69,6 @@ void usb0_evt(enum gpio_signal signal) #include "gpio_list.h" -/* ALS instances. Must be in same order as enum als_id. */ -struct als_t als[] = { - {"ISL", isl29035_init, isl29035_read_lux, 5}, -}; -BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT); - /* power signal list. Must match order of enum power_signal. */ const struct power_signal_info power_signal_list[] = { {GPIO_RSMRST_L_PGOOD, 1, "RSMRST_N_PWRGD"}, @@ -112,8 +104,7 @@ const struct i2c_port_t i2c_ports[] = { {"pmic", MEC1322_I2C0_0, 400, GPIO_I2C0_0_SCL, GPIO_I2C0_0_SDA}, {"muxes", MEC1322_I2C0_1, 400, GPIO_I2C0_1_SCL, GPIO_I2C0_1_SDA}, {"pd_mcu", MEC1322_I2C1, 500, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, - {"sensor", MEC1322_I2C2, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA }, - {"batt", MEC1322_I2C3, 100, GPIO_I2C3_SCL, GPIO_I2C3_SDA }, + {"batt", MEC1322_I2C3, 100, GPIO_I2C3_SCL, GPIO_I2C3_SDA}, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); diff --git a/board/lars/board.h b/board/lars/board.h index 35560b45e2..04b4f7b74f 100644 --- a/board/lars/board.h +++ b/board/lars/board.h @@ -16,8 +16,6 @@ /* Optional features */ #define CONFIG_ADC -#define CONFIG_ALS -#define CONFIG_ALS_ISL29035 #define CONFIG_BATTERY_CUT_OFF #define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L #define CONFIG_BATTERY_SMART @@ -126,7 +124,6 @@ #define I2C_PORT_USB_MUX MEC1322_I2C0_1 #define I2C_PORT_PD_MCU MEC1322_I2C1 #define I2C_PORT_TCPC MEC1322_I2C1 -#define I2C_PORT_ALS MEC1322_I2C2 #define I2C_PORT_BATTERY MEC1322_I2C3 #define I2C_PORT_CHARGER MEC1322_I2C3 #define I2C_PORT_THERMAL MEC1322_I2C3 @@ -158,12 +155,6 @@ enum adc_channel { ADC_CH_COUNT }; -/* Light sensors */ -enum als_id { - ALS_ISL29035 = 0, - ALS_COUNT, -}; - enum pwm_channel { PWM_CH_KBLIGHT, /* Number of PWM channels */ diff --git a/board/lars/ec.tasklist b/board/lars/ec.tasklist index 304a597f96..803c0d4798 100644 --- a/board/lars/ec.tasklist +++ b/board/lars/ec.tasklist @@ -19,7 +19,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(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ diff --git a/board/lars/gpio.inc b/board/lars/gpio.inc index 0410d18e61..fd09a1b16d 100644 --- a/board/lars/gpio.inc +++ b/board/lars/gpio.inc @@ -78,8 +78,8 @@ GPIO(I2C0_1_SCL, PIN(134), GPIO_INPUT) GPIO(I2C0_1_SDA, PIN(17), GPIO_INPUT) GPIO(I2C1_SCL, PIN(22), GPIO_INPUT) GPIO(I2C1_SDA, PIN(23), GPIO_INPUT) -GPIO(I2C2_SCL, PIN(20), GPIO_INPUT) -GPIO(I2C2_SDA, PIN(21), GPIO_INPUT) +GPIO(NC_20, PIN(20), GPIO_INPUT | GPIO_PULL_UP) /* I2C2_SCL */ +GPIO(NC_21, PIN(21), GPIO_INPUT | GPIO_PULL_UP) /* I2C2_SDA */ GPIO(I2C3_SCL, PIN(24), GPIO_INPUT) GPIO(I2C3_SDA, PIN(25), GPIO_INPUT) @@ -158,8 +158,8 @@ ALTERNATE(PIN_MASK(6, 0x06), 1, MODULE_ADC, GPIO_ANALOG) /* I2C pins */ /* I2C0_0 CLK - GPIO015, I2C0_0 DAT - GPIO016, I2C0_1 DAT - GPIO017 */ ALTERNATE(PIN_MASK(1, 0xe0), 2, MODULE_I2C, GPIO_ODR_HIGH) -/* I2C{1,2,3} CLK / DAT - GPIO020-GPIO025*/ -ALTERNATE(PIN_MASK(2, 0x3f), 2, MODULE_I2C, GPIO_ODR_HIGH) +/* I2C{1,2,3} CLK / DAT - GPIO022-GPIO025*/ +ALTERNATE(PIN_MASK(2, 0x3c), 2, MODULE_I2C, GPIO_ODR_HIGH) /* I2C0_1 CLK - GPIO134 */ ALTERNATE(PIN_MASK(13, 0x10), 2, MODULE_I2C, GPIO_ODR_HIGH)