mb/supermicro/x11-lga1151-series: rework gpio setup to not use headers

Rework gpio setup for the board series to not use headers but
stage-specific compilation units.

Tested successfully on X11SSM-F.

Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Change-Id: Ic62ce4335af605c081ef288e892441585ff2bd3e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48087
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by:  Felix Singer <felixsinger@posteo.net>

6 files changed, 81 insertions, 51 deletions

diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/include/variant/gpio.h b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/gpio.c
index 449349dc6c..e37e008285 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/include/variant/gpio.h
+++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/gpio.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GPIO_X11SSH_F_H
-#define _GPIO_X11SSH_F_H
-
+#include <mainboard/gpio.h>
 #include <soc/gpe.h>
 #include <soc/gpio.h>
 
@@ -226,17 +224,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_I10, NONE, DEEP, NF1),
 };
 
-static const struct pad_config early_gpio_table[] = {
-	/* Early LPC configuration in romstage */
-	PAD_CFG_NF(GPP_A1, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A2, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A3, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A4, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A5, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1),
-};
-
-#endif /* _GPIO_X11SSH_F_H */
+void mainboard_configure_gpios(void)
+{
+	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
+}
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/gpio_early.c b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/gpio_early.c
new file mode 100644
index 0000000000..3ea21e0321
--- /dev/null
+++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/gpio_early.c
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <mainboard/gpio.h>
+#include <soc/gpio.h>
+
+static const struct pad_config early_gpio_table[] = {
+	/* Early LPC configuration in romstage */
+	PAD_CFG_NF(GPP_A1, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A2, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A3, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A4, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A5, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1),
+};
+
+void mainboard_configure_early_gpios(void)
+{
+	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
+}
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/include/variant/gpio.h b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/gpio.c
index 486caf4185..06d3bd43c3 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/include/variant/gpio.h
+++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/gpio.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GPIO_X11SSH_TF_H
-#define _GPIO_X11SSH_TF_H
-
+#include <mainboard/gpio.h>
 #include <soc/gpe.h>
 #include <soc/gpio.h>
 
@@ -226,17 +224,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_I10, NONE, DEEP, NF1),
 };
 
-static const struct pad_config early_gpio_table[] = {
-	/* Early LPC configuration in romstage */
-	PAD_CFG_NF(GPP_A1, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A2, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A3, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A4, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A5, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1),
-};
-
-#endif /* _GPIO_X11SSH_TF_H */
+void mainboard_configure_gpios(void)
+{
+	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
+}
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/gpio_early.c b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/gpio_early.c
new file mode 100644
index 0000000000..3ea21e0321
--- /dev/null
+++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/gpio_early.c
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <mainboard/gpio.h>
+#include <soc/gpio.h>
+
+static const struct pad_config early_gpio_table[] = {
+	/* Early LPC configuration in romstage */
+	PAD_CFG_NF(GPP_A1, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A2, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A3, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A4, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A5, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1),
+};
+
+void mainboard_configure_early_gpios(void)
+{
+	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
+}
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/include/variant/gpio.h b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/gpio.c
index 8c9d08e5ef..dc41573224 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/include/variant/gpio.h
+++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/gpio.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GPIO_X11SSM_F_H
-#define _GPIO_X11SSM_F_H
-
+#include <mainboard/gpio.h>
 #include <soc/gpe.h>
 #include <soc/gpio.h>
 
@@ -232,17 +230,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPD11, NONE),
 };
 
-static const struct pad_config early_gpio_table[] = {
-	/* Early LPC configuration in romstage */
-	PAD_CFG_NF(GPP_A1, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A2, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A3, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A4, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A5, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1),
-};
-
-#endif /* _GPIO_X11SSM_F_H */
+void mainboard_configure_gpios(void)
+{
+	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
+}
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/gpio_early.c b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/gpio_early.c
new file mode 100644
index 0000000000..3ea21e0321
--- /dev/null
+++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/gpio_early.c
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <mainboard/gpio.h>
+#include <soc/gpio.h>
+
+static const struct pad_config early_gpio_table[] = {
+	/* Early LPC configuration in romstage */
+	PAD_CFG_NF(GPP_A1, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A2, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A3, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A4, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A5, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1),
+	PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1),
+};
+
+void mainboard_configure_early_gpios(void)
+{
+	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
+}