flapjack: add tcs3400 sensor

 - configure flapjack to use the tcs3400 ALS and RGB drivers
 - configure signal connections for the tcs3400
 - remove opt3001 ALS sensor

BUG=b:124512628
BRANCH=master
CQ-DEPEND=CL:1541955,CL:1551748
TEST=Cherry-pick CLs to add the tcs3400 RGB driver and
the tcs3400 ALS driver, build and flash to flapjack board
with tcs3400 int line wired to PA14, and verify chip is
interrupting and packaging up data.

Change-Id: I98aaa6bf4985b45cede497a08625b37b0620b0aa
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1561904
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>

3 files changed, 75 insertions, 28 deletions

diff --git a/board/flapjack/board.c b/board/flapjack/board.c
index 4cc27bc190..b80530c41c 100644
--- a/board/flapjack/board.c
+++ b/board/flapjack/board.c
@@ -15,7 +15,7 @@
 #include "console.h"
 #include "cros_board_info.h"
 #include "driver/accelgyro_bmi160.h"
-#include "driver/als_opt3001.h"
+#include "driver/als_tcs3400.h"
 #include "driver/battery/max17055.h"
 #include "driver/charger/rt946x.h"
 #include "driver/sync.h"
@@ -381,6 +381,9 @@ static void board_init(void)
 	/* Enable interrupts from BMI160 sensor. */
 	gpio_enable_interrupt(GPIO_ACCEL_INT_ODL);
 
+	/* Enable interrupt for the TCS3400 color light sensor */
+	gpio_enable_interrupt(GPIO_TCS3400_INT_ODL);
+
 	/* Enable interrupt for the camera vsync. */
 	gpio_enable_interrupt(GPIO_SYNC_INT);
 #endif /* SECTION_IS_RW */
@@ -413,10 +416,28 @@ void board_config_pre_init(void)
 static struct mutex g_lid_mutex;
 
 static struct bmi160_drv_data_t g_bmi160_data;
-static struct opt3001_drv_data_t g_opt3001_data = {
-	.scale = 1,
-	.uscale = 0,
-	.offset = 0,
+
+static struct tcs3400_drv_data_t g_tcs3400_data = {
+	.als_cal.scale = 1,
+	.als_cal.uscale = 0,
+	.als_cal.offset = 0,
+};
+
+static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = {
+	.device_scale = 1,
+	.device_uscale = 0,
+	.rgb_cal[X] = {
+		.scale = TCS3400_SCALE(1),
+		.offset = 0,
+	},
+	.rgb_cal[Y] = {
+		.scale = TCS3400_SCALE(1),
+		.offset = 0,
+	},
+	.rgb_cal[Z] = {
+		.scale = TCS3400_SCALE(1),
+		.offset = 0,
+	},
 };
 
 /* Matrix to rotate accelerometer into standard reference frame */
@@ -471,26 +492,42 @@ struct motion_sensor_t motion_sensors[] = {
 	 .min_frequency = BMI160_GYRO_MIN_FREQ,
 	 .max_frequency = BMI160_GYRO_MAX_FREQ,
 	},
-	[LID_ALS] = {
-	.name = "Light",
-	.active_mask = SENSOR_ACTIVE_S0_S3,
-	.chip = MOTIONSENSE_CHIP_OPT3001,
-	.type = MOTIONSENSE_TYPE_LIGHT,
-	.location = MOTIONSENSE_LOC_LID,
-	.drv = &opt3001_drv,
-	.drv_data = &g_opt3001_data,
-	.port = I2C_PORT_ALS,
-	.addr = OPT3001_I2C_ADDR1,
-	.rot_standard_ref = NULL,
-	.default_range = 0x10000, /* scale = 1; uscale = 0 */
-	.min_frequency = OPT3001_LIGHT_MIN_FREQ,
-	.max_frequency = OPT3001_LIGHT_MAX_FREQ,
-	.config = {
+	[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,
+	 .addr = TCS3400_I2C_ADDR,
+	 .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,
+	 .port = 0,      /* set to 0 to generate an error if access by itself */
+	 .addr = TCS3400_I2C_ADDR,
+	 .rot_standard_ref = NULL,
+	 .default_range = 0x10000, /* scale = 1x, uscale = 0 */
+	 .min_frequency = 0, /* 0 indicates we should not use sensor directly */
+	 .max_frequency = 0, /* 0 indicates we should not use sensor directly */
+	},
 	[VSYNC] = {
 	 .name = "Camera vsync",
 	 .active_mask = SENSOR_ACTIVE_S0,
@@ -505,7 +542,7 @@ struct motion_sensor_t motion_sensors[] = {
 };
 const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
 const struct motion_sensor_t *motion_als_sensors[] = {
-	&motion_sensors[LID_ALS],
+	&motion_sensors[CLEAR_ALS],
 };
 BUILD_ASSERT(ARRAY_SIZE(motion_als_sensors) == ALS_COUNT);
 #endif /* SECTION_IS_RW */
diff --git a/board/flapjack/board.h b/board/flapjack/board.h
index 8471f57697..5d7fdf7c5b 100644
--- a/board/flapjack/board.h
+++ b/board/flapjack/board.h
@@ -89,11 +89,17 @@
 #define CONFIG_ACCEL_INTERRUPTS
 #define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
 	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
+
 #define CONFIG_ALS
 #define ALS_COUNT 1
-#define CONFIG_ALS_OPT3001
-/* LID_ALS needs to be polled */
-#define CONFIG_ACCEL_FORCE_MODE_MASK    BIT(LID_ALS)
+
+/* TSC3400 ALS */
+#define CONFIG_ALS_TCS3400
+#define CONFIG_ALS_TCS3400_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(CLEAR_ALS)
+
+/* ALS needs to be polled */
+#define CONFIG_ACCEL_FORCE_MODE_MASK    BIT(CLEAR_ALS)
 
 /* Camera VSYNC */
 #define CONFIG_SYNC
@@ -280,8 +286,10 @@ enum power_signal {
 enum sensor_id {
 	LID_ACCEL = 0,
 	LID_GYRO,
-	LID_ALS,
+	CLEAR_ALS,
+	RGB_ALS,
 	VSYNC,
+	SENSOR_COUNT,
 };
 
 /* Batteries */
diff --git a/board/flapjack/gpio.inc b/board/flapjack/gpio.inc
index 309c36c714..7da5f53c6e 100644
--- a/board/flapjack/gpio.inc
+++ b/board/flapjack/gpio.inc
@@ -29,8 +29,11 @@ GPIO_INT(WARM_RESET_REQ,    PIN(A, 3),  GPIO_INT_RISING | GPIO_PULL_DOWN,
 GPIO_INT(AP_EC_WATCHDOG_L,  PIN(C, 2),  GPIO_INT_FALLING,
          chipset_watchdog_interrupt)
 
-GPIO_INT_RW(ACCEL_INT_ODL,  PIN(A, 4), GPIO_INT_FALLING | GPIO_SEL_1P8V | GPIO_PULL_UP,
-         bmi160_interrupt)
+GPIO_INT_RW(ACCEL_INT_ODL,  PIN(A, 4), GPIO_INT_FALLING | GPIO_SEL_1P8V | \
+	 GPIO_PULL_UP, bmi160_interrupt)
+
+GPIO_INT_RW(TCS3400_INT_ODL,  PIN(A, 14), GPIO_INT_FALLING,
+         tcs3400_interrupt)
 GPIO_INT(CHARGER_INT_ODL,   PIN(C, 13), GPIO_INT_FALLING | GPIO_PULL_UP,
          rt946x_interrupt)
 GPIO_INT_RO(EMMC_CMD,       PIN(B, 15), GPIO_INT_FALLING,
@@ -83,7 +86,6 @@ GPIO(USB_C0_HPD_OD,        PIN(F, 1),  GPIO_ODR_LOW)
 GPIO(BOOTBLOCK_EN_L,       PIN(C, 1),  GPIO_ODR_HIGH)
 GPIO(USB_C0_DP_OE_L,       PIN(A, 5),  GPIO_OUT_HIGH)
 GPIO(EC_SWDIO,             PIN(A, 13), GPIO_ODR_HIGH)
-GPIO(EC_SWCLK,             PIN(A, 14), GPIO_ODR_HIGH)
 GPIO(EN_PP5000_USBC,       PIN(D, 2),  GPIO_OUT_LOW)
 GPIO(BPP_EPP_SEL,          PIN(B, 6),  GPIO_OUT_LOW)
 GPIO(NCP3902_EN_L,         PIN(C, 7),  GPIO_OUT_LOW)