2 files changed, 8 insertions, 11 deletions
diff --git a/src/mainboard/prodrive/hermes/variants/baseboard/gpio.c b/src/mainboard/prodrive/hermes/variants/baseboard/gpio.c
index 8735a9ef4b..096dc35785 100644
--- a/src/mainboard/prodrive/hermes/variants/baseboard/gpio.c
+++ b/src/mainboard/prodrive/hermes/variants/baseboard/gpio.c
@@ -2,6 +2,8 @@
 
 #include "include/variant/gpio.h"
 #include <commonlib/helpers.h>
+#include <soc/gpio.h>
+#include <intelblocks/gpio_defs.h>
 
 /* Pad configuration in ramstage */
 static const struct pad_config gpio_table[] = {
@@ -389,14 +391,12 @@ const struct pad_config early_gpio_table[] = {
 	PAD_CFG_GPO(GPP_H5, 0, DEEP),			/* PCH_HBLED_n */
 };
 
-const struct pad_config *get_gpio_table(size_t *num)
+void program_gpio_pads(void)
 {
-	*num = ARRAY_SIZE(gpio_table);
-	return gpio_table;
+	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
 }
 
-const struct pad_config *get_early_gpio_table(size_t *num)
+void program_early_gpio_pads(void)
 {
-	*num = ARRAY_SIZE(early_gpio_table);
-	return early_gpio_table;
+	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
 }
diff --git a/src/mainboard/prodrive/hermes/variants/baseboard/include/variant/gpio.h b/src/mainboard/prodrive/hermes/variants/baseboard/include/variant/gpio.h
index 50d18018f0..8fce3c8b39 100644
--- a/src/mainboard/prodrive/hermes/variants/baseboard/include/variant/gpio.h
+++ b/src/mainboard/prodrive/hermes/variants/baseboard/include/variant/gpio.h
@@ -3,10 +3,7 @@
 #ifndef PCH_GPIO_H
 #define PCH_GPIO_H
 
-#include <soc/gpio.h>
-#include <intelblocks/gpio_defs.h>
-
-const struct pad_config *get_gpio_table(size_t *num);
-const struct pad_config *get_early_gpio_table(size_t *num);
+void program_gpio_pads(void);
+void program_early_gpio_pads(void);
 
 #endif /* PCH_GPIO_H */