kevin: Add Sensor in S3, disable keyboard wakeup in tablet mode.

Let sensor be powered on in S3. It is useful for Android and if we want to
disable keyboard wakeup based on lid angle.
Allow EC to disable touchpad and not send keyboard events when lid angle
is greater than 180.

BUG=chrome-os-partner:57510,chromium:620633
BRANCH=gru
TEST=In S3, check the sensors are readable.
Check that when in S3 and lid angle is < 180 EC sends keyboard events.
Check that when in S3 and lid angle is > 180 EC does not send keyboard
events.

Change-Id: I4e7959ed37bc5dfdf9c105ecae94c314b253d77f
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/406739
Commit-Ready: Gwendal Grignou <gwendal@google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
(cherry picked from commit cbae8f9b321f33734a34cb85c82636bbfa7663ee)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/407779

3 files changed, 30 insertions, 19 deletions

diff --git a/board/kevin/board.c b/board/kevin/board.c
index 3a4d3e2d72..e7d4b2594d 100644
--- a/board/kevin/board.c
+++ b/board/kevin/board.c
@@ -293,7 +293,7 @@ static void board_spi_enable(void)
 {
 	spi_enable(CONFIG_SPI_ACCEL_PORT, 1);
 }
-DECLARE_HOOK(HOOK_CHIPSET_RESUME,
+DECLARE_HOOK(HOOK_CHIPSET_STARTUP,
 	     board_spi_enable,
 	     MOTION_SENSE_HOOK_PRIO - 1);
 
@@ -316,7 +316,7 @@ static void board_spi_disable(void)
 
 	spi_enable(CONFIG_SPI_ACCEL_PORT, 0);
 }
-DECLARE_HOOK(HOOK_CHIPSET_SUSPEND,
+DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN,
 	     board_spi_disable,
 	     MOTION_SENSE_HOOK_PRIO + 1);
 
@@ -488,7 +488,7 @@ struct motion_sensor_t motion_sensors[] = {
 	 */
 	[BASE_ACCEL] = {
 	 .name = "Base Accel",
-	 .active_mask = SENSOR_ACTIVE_S0,
+	 .active_mask = SENSOR_ACTIVE_S0_S3,
 	 .chip = MOTIONSENSE_CHIP_BMI160,
 	 .type = MOTIONSENSE_TYPE_ACCEL,
 	 .location = MOTIONSENSE_LOC_BASE,
@@ -510,10 +510,10 @@ struct motion_sensor_t motion_sensors[] = {
 			 .odr = 10000 | ROUND_UP_FLAG,
 			 .ec_rate = 100 * MSEC,
 		 },
-		 /* Sensor off in S3/S5 */
+		 /* EC use accel for angle detection */
 		 [SENSOR_CONFIG_EC_S3] = {
-			 .odr = 0,
-			 .ec_rate = 0
+			.odr = 10000 | ROUND_UP_FLAG,
+			.ec_rate = 0,
 		 },
 		 /* Sensor off in S3/S5 */
 		 [SENSOR_CONFIG_EC_S5] = {
@@ -524,7 +524,7 @@ struct motion_sensor_t motion_sensors[] = {
 	},
 	[BASE_GYRO] = {
 	 .name = "Base Gyro",
-	 .active_mask = SENSOR_ACTIVE_S0,
+	 .active_mask = SENSOR_ACTIVE_S0_S3,
 	 .chip = MOTIONSENSE_CHIP_BMI160,
 	 .type = MOTIONSENSE_TYPE_GYRO,
 	 .location = MOTIONSENSE_LOC_BASE,
@@ -565,7 +565,7 @@ struct motion_sensor_t motion_sensors[] = {
 #ifdef BOARD_KEVIN
 	[LID_ACCEL] = {
 	 .name = "Lid Accel",
-	 .active_mask = SENSOR_ACTIVE_S0,
+	 .active_mask = SENSOR_ACTIVE_S0_S3,
 	 .chip = MOTIONSENSE_CHIP_BMA255,
 	 .type = MOTIONSENSE_TYPE_ACCEL,
 	 .location = MOTIONSENSE_LOC_LID,
@@ -587,9 +587,9 @@ struct motion_sensor_t motion_sensors[] = {
 			.odr = 10000 | ROUND_UP_FLAG,
 			.ec_rate = 0,
 		},
-		/* unused */
+		 /* EC use accel for angle detection */
 		[SENSOR_CONFIG_EC_S3] = {
-			.odr = 0,
+			.odr = 10000 | ROUND_UP_FLAG,
 			.ec_rate = 0,
 		},
 		[SENSOR_CONFIG_EC_S5] = {
@@ -601,7 +601,7 @@ struct motion_sensor_t motion_sensors[] = {
 #else
 	[LID_ACCEL] = {
 	 .name = "Lid Accel",
-	 .active_mask = SENSOR_ACTIVE_S0,
+	 .active_mask = SENSOR_ACTIVE_S0_S3,
 	 .chip = MOTIONSENSE_CHIP_KX022,
 	 .type = MOTIONSENSE_TYPE_ACCEL,
 	 .location = MOTIONSENSE_LOC_LID,
@@ -623,9 +623,9 @@ struct motion_sensor_t motion_sensors[] = {
 			.odr = 10000 | ROUND_UP_FLAG,
 			.ec_rate = 0,
 		},
-		/* unused */
+		 /* EC use accel for angle detection */
 		[SENSOR_CONFIG_EC_S3] = {
-			.odr = 0,
+			.odr = 10000 | ROUND_UP_FLAG,
 			.ec_rate = 0,
 		},
 		[SENSOR_CONFIG_EC_S5] = {
@@ -639,6 +639,16 @@ struct motion_sensor_t motion_sensors[] = {
 const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
 #endif /* defined(HAS_TASK_MOTIONSENSE) */
 
+#ifndef TEST_BUILD
+void lid_angle_peripheral_enable(int enable)
+{
+	keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE);
+
+	/* enable/disable touchpad */
+	gpio_set_level(GPIO_PP3300_TRACKPAD_EN_L, !enable);
+}
+#endif
+
 #ifdef BOARD_GRU
 static void usb_charge_resume(void)
 {
diff --git a/board/kevin/board.h b/board/kevin/board.h
index 8dffa4aad5..ff8adac623 100644
--- a/board/kevin/board.h
+++ b/board/kevin/board.h
@@ -86,6 +86,7 @@
 #define CONFIG_LID_ANGLE
 #define CONFIG_LID_ANGLE_INVALID_CHECK
 #define CONFIG_LID_ANGLE_TABLET_MODE
+#define CONFIG_LID_ANGLE_UPDATE
 #define CONFIG_LID_ANGLE_SENSOR_BASE    BASE_ACCEL
 #define CONFIG_LID_ANGLE_SENSOR_LID     LID_ACCEL
 /* FIFO size is in power of 2. */
diff --git a/power/rk3399.c b/power/rk3399.c
index 9fd9ef27fb..960da80b3a 100644
--- a/power/rk3399.c
+++ b/power/rk3399.c
@@ -228,6 +228,10 @@ enum power_state power_handle_state(enum power_state state)
 		msleep(1);
 		gpio_set_level(GPIO_PP1800_LID_EN_L, 0);
 
+		gpio_set_level(GPIO_PP1800_SIXAXIS_EN_L, 0);
+		msleep(2);
+		gpio_set_level(GPIO_PP1800_SENSOR_EN_L, 0);
+
 		/*
 		 * TODO: Consider ADC_PP900_AP / ADC_PP1200_LPDDR analog
 		 * voltage levels for state transition.
@@ -264,10 +268,6 @@ enum power_state power_handle_state(enum power_state state)
 			sys_reset_asserted = 0;
 		}
 
-		gpio_set_level(GPIO_PP1800_SIXAXIS_EN_L, 0);
-		msleep(2);
-		gpio_set_level(GPIO_PP1800_SENSOR_EN_L, 0);
-
 		if (power_wait_signals(IN_PGOOD_S0)) {
 			chipset_force_shutdown();
 			return POWER_S3S0;
@@ -290,8 +290,6 @@ enum power_state power_handle_state(enum power_state state)
 		hook_notify(HOOK_CHIPSET_SUSPEND);
 		MSLEEP_CHECK_ABORTED_SUSPEND(20);
 
-		gpio_set_level(GPIO_PP1800_SENSOR_EN_L, 1);
-		gpio_set_level(GPIO_PP1800_SIXAXIS_EN_L, 1);
 		gpio_set_level(GPIO_PP3300_S0_EN_L, 1);
 		MSLEEP_CHECK_ABORTED_SUSPEND(20);
 
@@ -330,6 +328,8 @@ enum power_state power_handle_state(enum power_state state)
 		/* Call hooks before we remove power rails */
 		hook_notify(HOOK_CHIPSET_SHUTDOWN);
 
+		gpio_set_level(GPIO_PP1800_SENSOR_EN_L, 1);
+		gpio_set_level(GPIO_PP1800_SIXAXIS_EN_L, 1);
 		gpio_set_level(GPIO_PP1800_LID_EN_L, 1);
 		gpio_set_level(GPIO_PP3300_TRACKPAD_EN_L, 1);
 		gpio_set_level(GPIO_PP5000_EN, 0);