From cadc70f7974db25144381b3ea26d4b660233f4dd Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Sun, 12 May 2019 13:44:22 +0200
Subject: soc/intel/broadwell: Move GPIO init to a common place

This also links the gpio configuration instead of including it as a
header.

Change-Id: I9309d2b842495f6cff33fdab18aa139a82c1959c
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32759
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
---
 src/soc/intel/broadwell/include/soc/gpio.h  | 2 ++
 src/soc/intel/broadwell/romstage/romstage.c | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'src/soc/intel')

diff --git a/src/soc/intel/broadwell/include/soc/gpio.h b/src/soc/intel/broadwell/include/soc/gpio.h
index 66820b2184..c0ac13497b 100644
--- a/src/soc/intel/broadwell/include/soc/gpio.h
+++ b/src/soc/intel/broadwell/include/soc/gpio.h
@@ -193,4 +193,6 @@ int gpio_is_native(int gpio_num);
  */
 unsigned int get_gpios(const int *gpio_num_array);
 
+extern const struct gpio_config mainboard_gpio_config[];
+
 #endif
diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c
index 2531665f1f..7847829ac6 100644
--- a/src/soc/intel/broadwell/romstage/romstage.c
+++ b/src/soc/intel/broadwell/romstage/romstage.c
@@ -27,6 +27,7 @@
 #include <romstage_handoff.h>
 #include <stage_cache.h>
 #include <timestamp.h>
+#include <soc/gpio.h>
 #include <soc/me.h>
 #include <soc/pei_data.h>
 #include <soc/pm.h>
@@ -100,6 +101,9 @@ static void romstage_main(uint64_t tsc, uint32_t bist)
 	/* Set CPU frequency to maximum */
 	set_max_freq();
 
+	/* Initialize GPIOs */
+	init_gpios(mainboard_gpio_config);
+
 	/* Call into mainboard. */
 	mainboard_romstage_entry(&rp);
 
-- 
cgit v1.2.3