3 files changed, 32 insertions, 14 deletions
diff --git a/src/soc/mediatek/common/gpio.c b/src/soc/mediatek/common/gpio.c
index e8a50b2b18..bbfbb3d175 100644
--- a/src/soc/mediatek/common/gpio.c
+++ b/src/soc/mediatek/common/gpio.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <assert.h>
 #include <device/mmio.h>
 #include <gpio.h>
 
@@ -113,23 +114,16 @@ void gpio_output(gpio_t gpio, int value)
 	gpio_set_mode(gpio, GPIO_MODE);
 }
 
-enum {
-	MAX_EINT_REG_BITS = 32,
-};
-
-static void pos_bit_calc_for_eint(gpio_t gpio, u32 *pos, u32 *bit)
-{
-	*pos = gpio.id / MAX_EINT_REG_BITS;
-	*bit = gpio.id % MAX_EINT_REG_BITS;
-}
-
 int gpio_eint_poll(gpio_t gpio)
 {
 	u32 pos;
 	u32 bit;
 	u32 status;
+	struct eint_regs *mtk_eint;
 
-	pos_bit_calc_for_eint(gpio, &pos, &bit);
+	gpio_calc_eint_pos_bit(gpio, &pos, &bit);
+	mtk_eint = gpio_get_eint_reg(gpio);
+	assert(mtk_eint);
 
 	status = (read32(&mtk_eint->sta.regs[pos]) >> bit) & 0x1;
 
@@ -143,8 +137,12 @@ void gpio_eint_configure(gpio_t gpio, enum gpio_irq_type type)
 {
 	u32 pos;
 	u32 bit, mask;
+	struct eint_regs *mtk_eint;
+
+	gpio_calc_eint_pos_bit(gpio, &pos, &bit);
+	mtk_eint = gpio_get_eint_reg(gpio);
+	assert(mtk_eint);
 
-	pos_bit_calc_for_eint(gpio, &pos, &bit);
 	mask = 1 << bit;
 
 	/* Make it an input first. */
diff --git a/src/soc/mediatek/common/gpio_eint_v1.c b/src/soc/mediatek/common/gpio_eint_v1.c
new file mode 100644
index 0000000000..194dff45ad
--- /dev/null
+++ b/src/soc/mediatek/common/gpio_eint_v1.c
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <soc/addressmap.h>
+#include <gpio.h>
+
+void gpio_calc_eint_pos_bit(gpio_t gpio, u32 *pos, u32 *bit)
+{
+	*pos = gpio.id / MAX_EINT_REG_BITS;
+	*bit = gpio.id % MAX_EINT_REG_BITS;
+}
+
+struct eint_regs *gpio_get_eint_reg(gpio_t gpio)
+{
+	return (struct eint_regs *)(EINT_BASE);
+}
diff --git a/src/soc/mediatek/common/include/soc/gpio_common.h b/src/soc/mediatek/common/include/soc/gpio_common.h
index b12d9c92c5..870dac59ea 100644
--- a/src/soc/mediatek/common/include/soc/gpio_common.h
+++ b/src/soc/mediatek/common/include/soc/gpio_common.h
@@ -102,8 +102,6 @@ struct eint_regs {
 
 check_member(eint_regs, d1en, 0x420);
 
-static struct eint_regs *const mtk_eint = (void *)(EINT_BASE);
-
 /*
  * Firmware never enables interrupts on this platform.  This function
  * reads current EINT status and clears the pending interrupt.
@@ -117,4 +115,11 @@ int gpio_eint_poll(gpio_t gpio);
  */
 void gpio_eint_configure(gpio_t gpio, enum gpio_irq_type type);
 
+enum {
+	MAX_EINT_REG_BITS = 32,
+};
+
+void gpio_calc_eint_pos_bit(gpio_t gpio, u32 *pos, u32 *bit);
+struct eint_regs *gpio_get_eint_reg(gpio_t gpio);
+
 #endif