diff options
| -rw-r--r-- | board/kunimitsu/board.c | 4 | ||||
| -rw-r--r-- | board/kunimitsu/board.h | 20 | ||||
| -rw-r--r-- | board/kunimitsu/gpio.inc | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/board/kunimitsu/board.c b/board/kunimitsu/board.c index cf1f6d9501..4ac8b58cea 100644 --- a/board/kunimitsu/board.c +++ b/board/kunimitsu/board.c @@ -12,7 +12,7 @@ #include "charger.h" #include "console.h" #include "driver/accel_kxcj9.h" -#include "driver/als_isl29035.h" +#include "driver/als_opt3001.h" #include "driver/temp_sensor/tmp432.h" #include "extpower.h" #include "gpio.h" @@ -291,7 +291,7 @@ BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); /* ALS instances. Must be in same order as enum als_id. */ struct als_t als[] = { - {"ISL", isl29035_read_lux, 5}, + {"TI", opt3001_read_lux, 5}, }; BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT); diff --git a/board/kunimitsu/board.h b/board/kunimitsu/board.h index 00a193a2fa..8c0664b19d 100644 --- a/board/kunimitsu/board.h +++ b/board/kunimitsu/board.h @@ -18,11 +18,11 @@ #define CONFIG_CHARGER #define CONFIG_CHARGER_V2 -#define CONFIG_CHARGER_BQ24770 +#define CONFIG_CHARGER_ISL9237 #define CONFIG_CHARGER_ILIM_PIN_DISABLED #define CONFIG_CHARGER_SENSE_RESISTOR 10 -#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 -#define CONFIG_CHARGER_INPUT_CURRENT 2240 +#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 +#define CONFIG_CHARGER_INPUT_CURRENT 512 #define CONFIG_CHARGER_DISCHARGE_ON_AC #define CONFIG_CHIPSET_SKYLAKE @@ -84,22 +84,28 @@ #define DEFERRABLE_MAX_COUNT 11 #define CONFIG_ALS -#define CONFIG_ALS_ISL29035 +#define CONFIG_ALS_OPT3001 +#define OPT3001_I2C_ADDR OPT3001_I2C_ADDR1 /* Accelerometer */ #define CONFIG_ACCEL_KXCJ9 -#define CONFIG_CMD_ACCELS -#define CONFIG_CMD_ACCEL_INFO #define CONFIG_LID_ANGLE #define CONFIG_LID_ANGLE_SENSOR_BASE 0 #define CONFIG_LID_ANGLE_SENSOR_LID 1 /* Modules we want to exclude */ +#undef CONFIG_CMD_ACCEL_INFO +#undef CONFIG_CMD_ACCELS +#undef CONFIG_CMD_HASH #undef CONFIG_CMD_SHMEM #undef CONFIG_CMD_TIMERINFO #undef CONFIG_CONSOLE_CMDHELP +#undef CONFIG_CONSOLE_HISTORY #undef CONFIG_PECI +/* Enable sleep mode in G3 */ +#define CONFIG_G3_SLEEP + #ifndef __ASSEMBLER__ #include "gpio_signal.h" @@ -139,7 +145,7 @@ enum temp_sensor_id { /* Light sensors */ enum als_id { - ALS_ISL29035 = 0, + ALS_OPT3001 = 0, ALS_COUNT, }; diff --git a/board/kunimitsu/gpio.inc b/board/kunimitsu/gpio.inc index 4a756b4322..e578cbd9bb 100644 --- a/board/kunimitsu/gpio.inc +++ b/board/kunimitsu/gpio.inc @@ -25,7 +25,7 @@ GPIO_INT(USB_C1_VBUS_WAKE_L,PIN(123), GPIO_INT_BOTH, vbus1_evt) GPIO_INT(USB_C0_BC12_INT_L, PIN(124), GPIO_INT_FALLING, usb0_evt) GPIO_INT(USB_C1_BC12_INT_L, PIN(145), GPIO_INT_FALLING, usb1_evt) /* Puesdo G3 */ -GPIO(G3_SLEEP_EN, PIN(55), GPIO_ODR_LOW) +GPIO(G3_SLEEP_EN, PIN(55), GPIO_OUT_LOW) GPIO(PD_RST_L, PIN(130), GPIO_ODR_HIGH) GPIO(USB2_OTG_ID, PIN(13), GPIO_ODR_HIGH) |