2 files changed, 22 insertions, 18 deletions
diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/include/variant/gpio.h b/src/mainboard/clevo/cml-u/variants/l140cu/gpio.c
index 1f7d119947..475c2d56da 100644
--- a/src/mainboard/clevo/cml-u/variants/l140cu/include/variant/gpio.h
+++ b/src/mainboard/clevo/cml-u/variants/l140cu/gpio.c
@@ -1,24 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef MAINBOARD_GPIO_H
-#define MAINBOARD_GPIO_H
-
+#include <mainboard/gpio.h>
 #include <soc/gpe.h>
 #include <soc/gpio.h>
 
-#ifndef __ACPI__
-
 /* Name format: <pad name> / <net/pin name in schematics> */
-
-/* Early pad configuration in romstage. */
-static const struct pad_config early_gpio_table[] = {
-	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),		/* UART2_RXD */
-	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),		/* UART2_TXD */
-	PAD_NC(GPP_C22, UP_20K),
-	PAD_NC(GPP_C23, UP_20K),
-};
-
-/* Pad configuration in ramstage. */
 static const struct pad_config gpio_table[] = {
 	/* ------- GPIO Group GPD ------- */
 	PAD_NC(GPD0, NONE),
@@ -251,6 +237,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H23, UP_20K),
 };
 
-#endif
-
-#endif
+void mainboard_configure_gpios(void)
+{
+	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
+}
diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c b/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c
new file mode 100644
index 0000000000..274efaf77f
--- /dev/null
+++ b/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <mainboard/gpio.h>
+#include <soc/gpio.h>
+
+/* Name format: <pad name> / <net/pin name in schematics> */
+static const struct pad_config early_gpio_table[] = {
+	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),		/* UART2_RXD */
+	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),		/* UART2_TXD */
+	PAD_NC(GPP_C22, UP_20K),
+	PAD_NC(GPP_C23, UP_20K),
+};
+
+void mainboard_configure_early_gpios(void)
+{
+	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
+}