summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin TerAvest <teravest@chromium.org>2018-02-28 11:45:02 -0700
committerMartin Roth <martinroth@google.com>2018-03-01 16:07:10 +0000
commit23cff8bf50c696c2dde812d4be7fa0ebfb3892ed (patch)
treea2205578d14a960084f878d004a8fb8890c61225
parentbb75effd87f9f86fa612dcfa1aa7b6156d110f01 (diff)
downloadcoreboot-23cff8bf50c696c2dde812d4be7fa0ebfb3892ed.tar.xz
mb/{amd/gardenia,google/kahlee}: Initialize GPIOs earlier
The GPIOs for PCIe reset and power enable for WLAN must be set up before amdinitearly for wlan to function. BUG=b:73898539 TEST=Boot, see WLAN controller in lspci Change-Id: I568a3240a54817ab6dcf15fe39f7f1336943852b Signed-off-by: Justin TerAvest <teravest@chromium.org> Reviewed-on: https://review.coreboot.org/24916 Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/amd/gardenia/bootblock/bootblock.c2
-rw-r--r--src/mainboard/google/kahlee/bootblock/bootblock.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/mainboard/amd/gardenia/bootblock/bootblock.c b/src/mainboard/amd/gardenia/bootblock/bootblock.c
index dae59b78d8..cb2a13516b 100644
--- a/src/mainboard/amd/gardenia/bootblock/bootblock.c
+++ b/src/mainboard/amd/gardenia/bootblock/bootblock.c
@@ -18,7 +18,7 @@
#include "../gpio.h"
-void bootblock_mainboard_init(void)
+void bootblock_mainboard_early_init(void)
{
size_t num_gpios;
const struct soc_amd_stoneyridge_gpio *gpios;
diff --git a/src/mainboard/google/kahlee/bootblock/bootblock.c b/src/mainboard/google/kahlee/bootblock/bootblock.c
index 4a65d8f4fc..acdffe584a 100644
--- a/src/mainboard/google/kahlee/bootblock/bootblock.c
+++ b/src/mainboard/google/kahlee/bootblock/bootblock.c
@@ -20,13 +20,16 @@
#include <variant/ec.h>
#include <variant/gpio.h>
-void bootblock_mainboard_init(void)
+void bootblock_mainboard_early_init(void)
{
size_t num_gpios;
const struct soc_amd_stoneyridge_gpio *gpios;
gpios = variant_early_gpio_table(&num_gpios);
sb_program_gpios(gpios, num_gpios);
+}
+void bootblock_mainboard_init(void)
+{
/* Enable the EC as soon as we have visibility */
mainboard_ec_init();