aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2021-04-11 12:06:26 -0700
committerPatrick Georgi <pgeorgi@google.com>2021-04-18 20:41:04 +0000
commite206e2e7ff91ec9ebe7789eab37510874de9edf4 (patch)
tree67b2f3643682c919f5e5c4b7a0f2505aa1b5ce92 /src/mainboard
parente79431288209f239600874b8f0c45a9490fa0ed6 (diff)
soc/intel/cnl and mainboards: Drop `cnl_configure_pads()`
CB:31250 ("soc/intel/cannonlake: Configure GPIOs again after FSP-S is done") introduced a workaround in coreboot for `soc/intel/cannonlake` platforms to save and restore GPIO configuration performed by mainboard across call to FSP Silicon Init (FSP-S). This workaround was required because FSP-S was configuring GPIOs differently than mainboard resulting in boot and runtime issues because of misconfigured GPIOs. This issue has since been fixed in FSP (verified with FSP v1263 on hatch). However, there were still 4 boards in coreboot using `cnl_configure_pads()`. As part of RFC CB:50829, librem_cnl, clevo/cml-u and system76/lemp9 were tested to ensure that this workaround is no longer required. This change drops the workaround using `cnl_configure_pads()` and updates all mainboards to use `gpio_configure_pads()` instead. Signed-off-by: Furquan Shaikh <furquan@google.com> Tested-by: Angel Pons <th3fanbus@gmail.com> (Tested purism/librem_cnl) Tested-by: Michael Niewöhner <foss@mniewoehner.de> (Tested clevo/cml-u which is similar to system76/lemp9) Change-Id: I7a4facbf23fc81707cb111859600e641fde34fc4 Reviewed-on: https://review.coreboot.org/c/coreboot/+/52248 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de> 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.c2
-rw-r--r--src/mainboard/purism/librem_cnl/ramstage.c2
-rw-r--r--src/mainboard/system76/lemp9/ramstage.c2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/mainboard/google/drallion/ramstage.c b/src/mainboard/google/drallion/ramstage.c
index ceba219ecf..d44c7b19d3 100644
--- a/src/mainboard/google/drallion/ramstage.c
+++ b/src/mainboard/google/drallion/ramstage.c
@@ -2,7 +2,6 @@
#include <acpi/acpi.h>
#include <smbios.h>
-#include <soc/gpio.h>
#include <soc/ramstage.h>
#include <variant/gpio.h>
#include <vendorcode/google/chromeos/chromeos.h>
@@ -30,7 +29,7 @@ static void mainboard_init(void *chip_info)
size_t num_gpios;
gpio_table = variant_gpio_table(&num_gpios);
- cnl_configure_pads(gpio_table, num_gpios);
+ gpio_configure_pads(gpio_table, num_gpios);
}
static void mainboard_enable(struct device *dev)
diff --git a/src/mainboard/google/sarien/ramstage.c b/src/mainboard/google/sarien/ramstage.c
index de97c686ee..6287628a88 100644
--- a/src/mainboard/google/sarien/ramstage.c
+++ b/src/mainboard/google/sarien/ramstage.c
@@ -39,7 +39,7 @@ static void mainboard_init(void *chip_info)
size_t num_gpios;
gpio_table = variant_gpio_table(&num_gpios);
- cnl_configure_pads(gpio_table, num_gpios);
+ gpio_configure_pads(gpio_table, num_gpios);
/* Disable unused pads for devices with board ID > 2 */
if (board_id() > 2)
diff --git a/src/mainboard/purism/librem_cnl/ramstage.c b/src/mainboard/purism/librem_cnl/ramstage.c
index 381d03be13..0d5dd55e72 100644
--- a/src/mainboard/purism/librem_cnl/ramstage.c
+++ b/src/mainboard/purism/librem_cnl/ramstage.c
@@ -9,5 +9,5 @@ void mainboard_silicon_init_params(FSPS_UPD *supd)
* dependencies during hardware initialization. */
size_t num_gpios;
const struct pad_config *gpio_table = variant_gpio_table(&num_gpios);
- cnl_configure_pads(gpio_table, num_gpios);
+ gpio_configure_pads(gpio_table, num_gpios);
}
diff --git a/src/mainboard/system76/lemp9/ramstage.c b/src/mainboard/system76/lemp9/ramstage.c
index 35ffd53bc1..aef7f71a0e 100644
--- a/src/mainboard/system76/lemp9/ramstage.c
+++ b/src/mainboard/system76/lemp9/ramstage.c
@@ -7,5 +7,5 @@ void mainboard_silicon_init_params(FSPS_UPD *supd)
{
/* Configure pads prior to SiliconInit() in case there's any
* dependencies during hardware initialization. */
- cnl_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
+ gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
}