summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTing Shen <phoenixshen@google.com>2020-05-27 17:03:01 +0800
committerCommit Bot <commit-bot@chromium.org>2020-07-02 14:30:11 +0000
commit57ef57bd80563e98a1d7361c3852d32674381bb9 (patch)
treec1defc8e09cab8fcd4f28b5a18a2ae404a7a74a1
parent3a6aa5f78e6ed0662d262ff73dbebcaab1863a2b (diff)
downloadchrome-ec-57ef57bd80563e98a1d7361c3852d32674381bb9.tar.gz
asurada: enable light sensor tcs3400
BUG=b:150341271 TEST=accelread 4 BRANCH=none Signed-off-by: Ting Shen <phoenixshen@google.com> Change-Id: Ied14172644ddbcd6e4dd6db9f65cbfa1d17e4def Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2217217 Reviewed-by: Eric Yilun Lin <yllin@chromium.org> Tested-by: Ting Shen <phoenixshen@chromium.org> Commit-Queue: Ting Shen <phoenixshen@chromium.org>
-rw-r--r--board/asurada/board.c89
-rw-r--r--board/asurada/board.h10
-rw-r--r--board/asurada/gpio.inc3
3 files changed, 101 insertions, 1 deletions
diff --git a/board/asurada/board.c b/board/asurada/board.c
index 8f325d3f3f..4443e73cc6 100644
--- a/board/asurada/board.c
+++ b/board/asurada/board.c
@@ -14,6 +14,7 @@
#include "console.h"
#include "driver/accel_lis2dw12.h"
#include "driver/accelgyro_bmi_common.h"
+#include "driver/als_tcs3400.h"
#include "driver/bc12/mt6360.h"
#include "driver/bc12/pi3usb9201.h"
#include "driver/charger/isl923x.h"
@@ -543,6 +544,59 @@ static const mat33_fp_t mag_standard_ref = {
{0, 0, FLOAT_TO_FP(-1)},
};
+/* TCS3400 private data */
+static struct als_drv_data_t g_tcs3400_data = {
+ .als_cal.scale = 1,
+ .als_cal.uscale = 0,
+ .als_cal.offset = 0,
+ .als_cal.channel_scale = {
+ .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kc */
+ .cover_scale = ALS_CHANNEL_SCALE(1.0), /* CT */
+ },
+};
+
+static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = {
+ /*
+ * TODO: calculate the actual coefficients and scaling factors
+ */
+ .calibration.rgb_cal[X] = {
+ .offset = 0,
+ .scale = {
+ .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kr */
+ .cover_scale = ALS_CHANNEL_SCALE(1.0)
+ },
+ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0),
+ },
+ .calibration.rgb_cal[Y] = {
+ .offset = 0,
+ .scale = {
+ .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kg */
+ .cover_scale = ALS_CHANNEL_SCALE(1.0)
+ },
+ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0.1),
+ },
+ .calibration.rgb_cal[Z] = {
+ .offset = 0,
+ .scale = {
+ .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kb */
+ .cover_scale = ALS_CHANNEL_SCALE(1.0)
+ },
+ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0),
+ .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0),
+ },
+ .calibration.irt = INT_TO_FP(1),
+ .saturation.again = TCS_DEFAULT_AGAIN,
+ .saturation.atime = TCS_DEFAULT_ATIME,
+};
+
struct motion_sensor_t motion_sensors[] = {
/*
* Note: bmi160: supports accelerometer and gyro sensor
@@ -637,5 +691,40 @@ struct motion_sensor_t motion_sensors[] = {
},
},
},
+ [CLEAR_ALS] = {
+ .name = "Clear Light",
+ .active_mask = SENSOR_ACTIVE_S0_S3,
+ .chip = MOTIONSENSE_CHIP_TCS3400,
+ .type = MOTIONSENSE_TYPE_LIGHT,
+ .location = MOTIONSENSE_LOC_LID,
+ .drv = &tcs3400_drv,
+ .drv_data = &g_tcs3400_data,
+ .port = I2C_PORT_ACCEL,
+ .i2c_spi_addr_flags = TCS3400_I2C_ADDR_FLAGS,
+ .rot_standard_ref = NULL,
+ .default_range = 0x10000, /* scale = 1x, uscale = 0 */
+ .min_frequency = TCS3400_LIGHT_MIN_FREQ,
+ .max_frequency = TCS3400_LIGHT_MAX_FREQ,
+ .config = {
+ /* Run ALS sensor in S0 */
+ [SENSOR_CONFIG_EC_S0] = {
+ .odr = 1000,
+ },
+ },
+ },
+ [RGB_ALS] = {
+ .name = "RGB Light",
+ .active_mask = SENSOR_ACTIVE_S0_S3,
+ .chip = MOTIONSENSE_CHIP_TCS3400,
+ .type = MOTIONSENSE_TYPE_LIGHT_RGB,
+ .location = MOTIONSENSE_LOC_LID,
+ .drv = &tcs3400_rgb_drv,
+ .drv_data = &g_tcs3400_rgb_data,
+ .rot_standard_ref = NULL,
+ .default_range = 0x10000, /* scale = 1x, uscale = 0 */
+ /* freq = 0 indicates we should not use sensor directly */
+ .min_frequency = 0,
+ .max_frequency = 0,
+ },
};
const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
diff --git a/board/asurada/board.h b/board/asurada/board.h
index ba86327876..458e0d5405 100644
--- a/board/asurada/board.h
+++ b/board/asurada/board.h
@@ -158,6 +158,14 @@
#define CONFIG_TEMP_SENSOR
#define CONFIG_THERMISTOR
+#define ALS_COUNT 1
+#define CONFIG_ALS_TCS3400
+#define CONFIG_ALS_TCS3400_INT_EVENT \
+ TASK_EVENT_MOTION_SENSOR_INTERRUPT(CLEAR_ALS)
+#define CONFIG_ALS_TCS3400_EMULATED_IRQ_EVENT
+
+#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(CLEAR_ALS)
+
/* SPI / Host Command */
#define CONFIG_SPI
#define CONFIG_SUPPRESSED_HOST_COMMANDS \
@@ -236,6 +244,8 @@ enum sensor_id {
BASE_GYRO,
BASE_MAG,
LID_ACCEL,
+ CLEAR_ALS,
+ RGB_ALS,
SENSOR_COUNT,
};
diff --git a/board/asurada/gpio.inc b/board/asurada/gpio.inc
index 316f4a7882..7dd8aa6bf0 100644
--- a/board/asurada/gpio.inc
+++ b/board/asurada/gpio.inc
@@ -33,6 +33,8 @@ GPIO_INT(BASE_IMU_INT_L, PIN(J, 2), GPIO_INT_FALLING | GPIO_SEL_1P8V,
bmi160_interrupt)
GPIO_INT(LID_ACCEL_INT_L, PIN(J, 3), GPIO_INT_FALLING | GPIO_SEL_1P8V,
lis2dw12_interrupt)
+GPIO_INT(ALS_RGB_INT_ODL, PIN(F, 0), GPIO_INT_FALLING,
+ tcs3400_interrupt)
/* USB-C interrupts */
GPIO_INT(USB_C0_PPC_INT_ODL, PIN(D, 1), GPIO_INT_BOTH, ppc_interrupt)
@@ -149,7 +151,6 @@ UNIMPLEMENTED_GPIO(TEMP_SENSOR_CHARGER, PIN(I, 5))
UNIMPLEMENTED_GPIO(CHARGER_PMON, PIN(I, 6))
UNIMPLEMENTED_GPIO(TEMP_SENSOR_AP, PIN(I, 7))
UNIMPLEMENTED_GPIO(EC_DPBRDG_HPD_ODL, PIN(J, 0))
-UNIMPLEMENTED_GPIO(ALS_RGB_INT_ODL, PIN(F, 0))
UNIMPLEMENTED_GPIO(EC_USB_C0_CC1, PIN(F, 4))
UNIMPLEMENTED_GPIO(EC_USB_C0_CC2, PIN(F, 5))
UNIMPLEMENTED_GPIO(EC_USB_C1_CC1, PIN(H, 1))