4 files changed, 8 insertions, 24 deletions
diff --git a/board/crota/board.c b/board/crota/board.c
index a12ef75d30..cb3e79ee56 100644
--- a/board/crota/board.c
+++ b/board/crota/board.c
@@ -51,7 +51,7 @@ static void board_chipset_suspend(void)
 }
 DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT);
 
-bool board_is_convertible(void)
+static bool board_is_convertible(void)
 {
 	/*
 	 * convertible = 0
diff --git a/board/crota/board.h b/board/crota/board.h
index d652a93ad0..3d79e190bd 100644
--- a/board/crota/board.h
+++ b/board/crota/board.h
@@ -288,8 +288,6 @@ enum thermal_cfg_table { LAPTOP_MODE, TABLET_MODE, THERMAL_CFG_TABLE_COUNT };
 
 void motion_interrupt(enum gpio_signal signal);
 
-bool board_is_convertible(void);
-
 #endif /* !__ASSEMBLER__ */
 
 #endif /* __CROS_EC_BOARD_H */
diff --git a/board/crota/charger.c b/board/crota/charger.c
index 9f044790e0..c7dcf7b0c1 100644
--- a/board/crota/charger.c
+++ b/board/crota/charger.c
@@ -79,3 +79,10 @@ int board_set_active_charge_port(int port)
 
 	return EC_SUCCESS;
 }
+
+__overridable void board_set_charge_limit(int port, int supplier, int charge_ma,
+					  int max_ma, int charge_mv)
+{
+	charge_set_input_current_limit(
+		MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT), charge_mv);
+}
diff --git a/board/crota/sensors.c b/board/crota/sensors.c
index 7d60234dc3..79d2492060 100644
--- a/board/crota/sensors.c
+++ b/board/crota/sensors.c
@@ -10,11 +10,9 @@
 #include "driver/accel_lis2dw12.h"
 #include "driver/accelgyro_bmi_common.h"
 #include "driver/accelgyro_lsm6dso.h"
-#include "fw_config.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "motion_sense.h"
-#include "tablet_mode.h"
 #include "temp_sensor.h"
 #include "thermal.h"
 #include "temp_sensor/thermistor.h"
@@ -211,29 +209,10 @@ static void board_update_motion_sensor_config(void)
 	} else {
 		ccprints("BASE IMU is LSM6DSO");
 	}
-
-	if (!board_is_convertible()) {
-		tablet_set_mode(0, TABLET_TRIGGER_LID);
-		gmr_tablet_switch_disable();
-		/* Make sure tablet mode detection is not trigger by mistake. */
-		gpio_set_flags(GPIO_TABLET_MODE_L, GPIO_INPUT | GPIO_PULL_UP);
-		/*
-		 * Make sure we don't even try to initialize the lid accel, it
-		 * is not present.
-		 */
-		motion_sensors[LID_ACCEL].active_mask = 0;
-		gpio_set_flags(GPIO_EC_ACCEL_INT_R_L,
-			       GPIO_INPUT | GPIO_PULL_UP);
-	}
 }
 DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_update_motion_sensor_config,
 	     HOOK_PRIO_INIT_I2C + 1);
 
-__override int sensor_board_is_lid_angle_available(void)
-{
-	return board_is_convertible();
-}
-
 static void baseboard_sensors_init(void)
 {
 	/* Enable gpio interrupt for lid accel sensor */