1 files changed, 24 insertions, 20 deletions

diff --git a/zephyr/program/nissa/uldren/src/form_factor.c b/zephyr/program/nissa/uldren/src/form_factor.c
index 72c0ba04d3..2dcc61c590 100644
--- a/zephyr/program/nissa/uldren/src/form_factor.c
+++ b/zephyr/program/nissa/uldren/src/form_factor.c
@@ -4,42 +4,46 @@
  */
 
 #include "accelgyro.h"
+#include "button.h"
+#include "cros_board_info.h"
 #include "cros_cbi.h"
+#include "driver/accel_bma4xx.h"
+#include "driver/accelgyro_bmi323.h"
+#include "gpio/gpio_int.h"
 #include "hooks.h"
+#include "motion_sense.h"
 #include "motionsense_sensors.h"
+#include "tablet_mode.h"
 
 #include <zephyr/devicetree.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
-/*
- * Mainboard orientation support.
- */
-
-#define ALT_MAT SENSOR_ROT_STD_REF_NAME(DT_NODELABEL(base_rot_inverted))
-#define BASE_SENSOR SENSOR_ID(DT_NODELABEL(base_accel))
-#define BASE_GYRO SENSOR_ID(DT_NODELABEL(base_gyro))
-
 static void form_factor_init(void)
 {
 	int ret;
 	uint32_t val;
-	/*
-	 * If the firmware config indicates
-	 * an inverted form factor, use the alternative
-	 * rotation matrix.
-	 */
-	ret = cros_cbi_get_fw_config(FW_BASE_INVERSION, &val);
+
+	/*check tabletmode*/
+	ret = cros_cbi_get_fw_config(FW_TABLET, &val);
 	if (ret != 0) {
-		LOG_ERR("Error retrieving CBI FW_CONFIG field %d",
-			FW_BASE_INVERSION);
+		LOG_ERR("Error retrieving CBI FW_CONFIG field %d", FW_TABLET);
 		return;
 	}
-	if (val == FW_BASE_INVERTED) {
-		LOG_INF("Switching to inverted base");
-		motion_sensors[BASE_SENSOR].rot_standard_ref = &ALT_MAT;
-		motion_sensors[BASE_GYRO].rot_standard_ref = &ALT_MAT;
+	if (val == FW_TABLET_NOT_PRESENT) {
+		LOG_INF("Clamshell: disable motionsense function.");
+		motion_sensor_count = 0;
+		gmr_tablet_switch_disable();
+		gpio_disable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_imu));
+		gpio_pin_configure_dt(GPIO_DT_FROM_NODELABEL(gpio_imu_int_l),
+				      GPIO_DISCONNECTED);
+
+		LOG_INF("Clamshell: disable volume button function.");
+		button_disable_gpio(BUTTON_VOLUME_UP);
+		button_disable_gpio(BUTTON_VOLUME_DOWN);
+	} else {
+		LOG_INF("Tablet: Enable motionsense function.");
 	}
 }
 DECLARE_HOOK(HOOK_INIT, form_factor_init, HOOK_PRIO_POST_I2C);