summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2019-10-23 11:14:23 -0700
committerPatrick Georgi <pgeorgi@google.com>2019-10-25 06:55:22 +0000
commit514ddef4e51c3f9ec1747764e438b570e6725864 (patch)
tree6fe6ecd4b3b37b4b9f701d0a1eb4f5a6e29880de /src/mainboard
parentfb9f320d810b82790ecbaeeb8671c723f433e904 (diff)
downloadcoreboot-514ddef4e51c3f9ec1747764e438b570e6725864.tar.xz
mb/google/{drallion,sarien}: Configure GPIOs in mainboard chip->init()
mainboard_silicon_init_params() is supposed to be used for only overriding any FSP params as per mainboard configuration. GPIOs should be configured by mainboard as part of its chip init(). This ensures proper ordering w.r.t. any common operations that the SoC code might want to perform e.g. snapshot ITSS polarities. This change moves the configuration of GPIOs from mainboard_silicon_init_params() to mainboard chip->init(). Change-Id: I5cd89c6e24b6a4b0c20fd476915f3781a0d46e0d Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36269 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Mathew King <mathewk@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/drallion/ramstage.c3
-rw-r--r--src/mainboard/google/sarien/ramstage.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mainboard/google/drallion/ramstage.c b/src/mainboard/google/drallion/ramstage.c
index b3bf10296a..6d3ebb46cb 100644
--- a/src/mainboard/google/drallion/ramstage.c
+++ b/src/mainboard/google/drallion/ramstage.c
@@ -66,7 +66,7 @@ static const struct pad_config gpio_unused[] = {
/* M2_SKT2_CFG1 */ PAD_NC(GPP_H13, NONE),
};
-void mainboard_silicon_init_params(FSP_S_CONFIG *params)
+static void mainboard_init(void *chip_info)
{
const struct pad_config *gpio_table;
size_t num_gpios;
@@ -85,5 +85,6 @@ static void mainboard_enable(struct device *dev)
}
struct chip_operations mainboard_ops = {
+ .init = mainboard_init,
.enable_dev = mainboard_enable,
};
diff --git a/src/mainboard/google/sarien/ramstage.c b/src/mainboard/google/sarien/ramstage.c
index 811afa1b16..d57c6fe08c 100644
--- a/src/mainboard/google/sarien/ramstage.c
+++ b/src/mainboard/google/sarien/ramstage.c
@@ -18,7 +18,6 @@
#include <drivers/vpd/vpd.h>
#include <smbios.h>
#include <soc/gpio.h>
-#include <soc/ramstage.h>
#include <variant/gpio.h>
#include <vendorcode/google/chromeos/chromeos.h>
@@ -68,7 +67,7 @@ static const struct pad_config gpio_unused[] = {
/* M2_SKT2_CFG1 */ PAD_NC(GPP_H13, NONE),
};
-void mainboard_silicon_init_params(FSP_S_CONFIG *params)
+static void mainboard_init(void *chip_info)
{
const struct pad_config *gpio_table;
size_t num_gpios;
@@ -87,5 +86,6 @@ static void mainboard_enable(struct device *dev)
}
struct chip_operations mainboard_ops = {
+ .init = mainboard_init,
.enable_dev = mainboard_enable,
};