asurada: remove board_get_version() == 0 check

Since hayato firmware is ready now, we can now replace
board_get_version() calls by compile time macros to make the
code simpler.

BUG=b:163098341
TEST=make BOARD=asurada/hayato
BRANCH=none

Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I5d40e29d097f0cf0cbc6d58b6154832e928445fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2437237
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>

3 files changed, 22 insertions, 43 deletions

diff --git a/board/asurada/board.c b/board/asurada/board.c
index 595dcf4330..712a89289e 100644
--- a/board/asurada/board.c
+++ b/board/asurada/board.c
@@ -96,7 +96,7 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
 
 /* Wake-up pins for hibernate */
 enum gpio_signal hibernate_wake_pins[] = {
-	GPIO_AC_PRESENT_PLACEHOLDER,
+	GPIO_AC_PRESENT,
 	GPIO_LID_OPEN,
 	GPIO_POWER_BUTTON_L,
 };
@@ -144,6 +144,8 @@ static void board_init(void)
 	/* For Rev0 only. Set GPM0~6 1.8V input. */
 	IT83XX_GPIO_GCR30 |= BIT(4);
 
+	gpio_enable_interrupt(GPIO_AC_PRESENT);
+
 	gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL);
 
 	/* Enable motion sensor interrupt */
@@ -605,27 +607,6 @@ int board_regulator_get_voltage(uint32_t index, uint32_t *voltage_mv)
 	return mt6360_regulator_get_voltage(id, voltage_mv);
 }
 
-/* gpio */
-
-/* TODO(b/163098341): Remove these after rev0 deprecated. */
-enum gpio_signal GPIO_AC_PRESENT = GPIO_AC_PRESENT_PLACEHOLDER;
-
-static void board_gpio_init(void)
-{
-	if (board_get_version() == 0)
-		GPIO_AC_PRESENT = GPIO_EC_GPM2;
-	else
-		GPIO_AC_PRESENT = GPIO_EC_GPE5;
-
-	/* Set wake pins to the correct one */
-	hibernate_wake_pins[0] = GPIO_AC_PRESENT;
-
-	/* Manually run extpower_init() again */
-	gpio_enable_interrupt(GPIO_AC_PRESENT);
-	extpower_interrupt(GPIO_AC_PRESENT);
-}
-DECLARE_HOOK(HOOK_INIT, board_gpio_init, HOOK_PRIO_INIT_ADC + 1);
-
 /* Sensor */
 static struct mutex g_base_mutex;
 static struct mutex g_lid_mutex;
@@ -633,14 +614,6 @@ static struct mutex g_lid_mutex;
 static struct bmi_drv_data_t g_bmi160_data;
 static struct stprivate_data g_lis2dwl_data;
 
-/* Matrix to rotate accelerometer into standard reference frame */
-/* for rev 0 */
-static const mat33_fp_t base_standard_ref_rev0 = {
-	{FLOAT_TO_FP(-1), 0, 0},
-	{0, FLOAT_TO_FP(1), 0},
-	{0, 0, FLOAT_TO_FP(-1)},
-};
-
 /* Matrix to rotate accelrator into standard reference frame */
 /* TODO: update the matrix after we have assembled unit */
 static const mat33_fp_t mag_standard_ref = {
@@ -660,16 +633,24 @@ static struct als_drv_data_t g_tcs3400_data = {
 	},
 };
 
+#ifdef BOARD_ASURADA
+/* Matrix to rotate accelerometer into standard reference frame */
+/* for rev 0 */
+static const mat33_fp_t base_standard_ref_rev0 = {
+	{FLOAT_TO_FP(-1), 0, 0},
+	{0, FLOAT_TO_FP(1), 0},
+	{0, 0, FLOAT_TO_FP(-1)},
+};
+
 static void update_rotation_matrix(void)
 {
-	if (board_get_version() == 0) {
-		motion_sensors[BASE_ACCEL].rot_standard_ref =
-			&base_standard_ref_rev0;
-		motion_sensors[BASE_GYRO].rot_standard_ref =
-			&base_standard_ref_rev0;
-	}
+	motion_sensors[BASE_ACCEL].rot_standard_ref =
+		&base_standard_ref_rev0;
+	motion_sensors[BASE_GYRO].rot_standard_ref =
+		&base_standard_ref_rev0;
 }
 DECLARE_HOOK(HOOK_INIT, update_rotation_matrix, HOOK_PRIO_INIT_ADC + 1);
+#endif
 
 static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = {
 	/*
diff --git a/board/asurada/board.h b/board/asurada/board.h
index af2149f929..b1cdec03e7 100644
--- a/board/asurada/board.h
+++ b/board/asurada/board.h
@@ -272,7 +272,5 @@ enum sensor_id {
 void board_reset_pd_mcu(void);
 int board_get_version(void);
 
-extern enum gpio_signal GPIO_AC_PRESENT;
-
 #endif /* !__ASSEMBLER__ */
 #endif /* __CROS_EC_BOARD_H */
diff --git a/board/asurada/gpio.inc b/board/asurada/gpio.inc
index 31f345db50..02458ec518 100644
--- a/board/asurada/gpio.inc
+++ b/board/asurada/gpio.inc
@@ -49,10 +49,13 @@ GPIO_INT(VOLUME_UP_L,        PIN(D, 6), GPIO_INT_BOTH | GPIO_PULL_UP,
          button_interrupt) /* EC_VOLUP_BTN_ODL */
 
 /* Other interrupts */
-GPIO_INT(EC_GPM2,            PIN(M, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
+#ifdef BOARD_ASURADA
+GPIO_INT(AC_PRESENT,         PIN(M, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
          extpower_interrupt) /* AC_OK / AC_PRESENT in rev0 */
-GPIO_INT(EC_GPE5,            PIN(E, 5), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
+#else /* HAYATO */
+GPIO_INT(AC_PRESENT,         PIN(E, 5), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
          extpower_interrupt) /* AC_OK / AC_PRESENT in rev1+ */
+#endif
 GPIO_INT(UART1_RX,           PIN(B, 0), GPIO_INT_FALLING,
          uart_deepsleep_interrupt) /* UART_DEBUG_TX_EC_RX */
 GPIO_INT(WP,                 PIN(I, 4), GPIO_INT_BOTH,
@@ -135,9 +138,6 @@ UNIMPLEMENTED(PCH_SCI_L)
 UNIMPLEMENTED(PCH_WAKE_L)
 UNIMPLEMENTED(PCH_PLTRST_L)
 
-/* Fake AC_PRESENT pin before board rev is determined */
-UNIMPLEMENTED(AC_PRESENT_PLACEHOLDER)
-
 #define UNIMPLEMENTED_GPIO(name, pin) UNIMPLEMENTED(name)
 
 UNIMPLEMENTED_GPIO(SET_VMC_VOLT_AT_1V8,    PIN(D, 4))