From a3fa98a5d75d1dcde97090aaa2e5a617c72b4559 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 20 Aug 2015 13:06:56 -0500 Subject: [PATCH] google/glados: configure gpio pads prior to SiliconInit() Move the gpio pad configuration prior to SiliconInit() in case there are dependencies of the pads being configured in prior to SiliconInit(). BUG=chrome-os-partner:43522 BUG=chrome-os-partner:43492 BRANCH=None TEST=Built and booted glados. Change-Id: I84f8e965bf205a4945b14a63fa8074953750f785 Signed-off-by: Patrick Georgi Original-Commit-Id: 5cce5347449f69ac6cf7030ea3b91d3f8b4cc7f9 Original-Change-Id: I18cd33a455d5635a866abb76142cab516b04f446 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/294642 Original-Reviewed-by: Duncan Laurie Reviewed-on: http://review.coreboot.org/11420 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/glados/mainboard.c | 3 --- src/mainboard/google/glados/ramstage.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/glados/mainboard.c b/src/mainboard/google/glados/mainboard.c index 61a548578f..5e48f1708c 100644 --- a/src/mainboard/google/glados/mainboard.c +++ b/src/mainboard/google/glados/mainboard.c @@ -22,12 +22,9 @@ #include #include #include "ec.h" -#include "gpio.h" static void mainboard_init(device_t dev) { - gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); - if (IS_ENABLED(CONFIG_GOOGLE_CHROME_EC)) mainboard_ec_init(); } diff --git a/src/mainboard/google/glados/ramstage.c b/src/mainboard/google/glados/ramstage.c index 8801380851..4816fec124 100644 --- a/src/mainboard/google/glados/ramstage.c +++ b/src/mainboard/google/glados/ramstage.c @@ -19,7 +19,11 @@ */ #include +#include "gpio.h" void mainboard_silicon_init_params(SILICON_INIT_UPD *params) { + /* Configure pads prior to SiliconInit() in case there's any + * dependencies during hardware initialization. */ + gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); }