summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2022-12-20 16:20:18 -0600
committerMartin L Roth <gaumless@gmail.com>2022-12-22 20:35:01 +0000
commit40c8cc9cde3096e83e9908dd353fb8be9817a6d8 (patch)
tree586a58c6a9b7b6111f9647f4192d04a7165c92f4
parent0d54a65819c5ddd2dd4fe6543f4f60891b9d950c (diff)
mb/google/reef: Add method to set GPIOs in romstage
Add method variant_romstage_gpio_table() with empty weak implementation to allow variants to override as needed for touchscreen power sequencing (to be implemented in a subsequent commit). Call method in romstage to program any GPIOs the variant may need to set. TEST=tested with rest of patch train Change-Id: Id3ab412183e5c5d534b2e1dea3222c729c25118b Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/71151 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/mainboard/google/reef/romstage.c7
-rw-r--r--src/mainboard/google/reef/variants/baseboard/Makefile.inc1
-rw-r--r--src/mainboard/google/reef/variants/baseboard/gpio.c7
-rw-r--r--src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h1
4 files changed, 16 insertions, 0 deletions
diff --git a/src/mainboard/google/reef/romstage.c b/src/mainboard/google/reef/romstage.c
index eac35282c4..b601fd4fe9 100644
--- a/src/mainboard/google/reef/romstage.c
+++ b/src/mainboard/google/reef/romstage.c
@@ -3,11 +3,18 @@
#include <baseboard/variants.h>
#include <soc/meminit.h>
#include <soc/romstage.h>
+#include <variant/gpio.h>
void mainboard_memory_init_params(FSPM_UPD *memupd)
{
+ const struct pad_config *pads;
+ size_t pads_num;
+
meminit_lpddr4_by_sku(&memupd->FspmConfig,
variant_lpddr4_config(), variant_memory_sku());
+
+ pads = variant_romstage_gpio_table(&pads_num);
+ gpio_configure_pads(pads, pads_num);
}
void mainboard_save_dimm_info(void)
diff --git a/src/mainboard/google/reef/variants/baseboard/Makefile.inc b/src/mainboard/google/reef/variants/baseboard/Makefile.inc
index 63b03a6118..1484261aed 100644
--- a/src/mainboard/google/reef/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/reef/variants/baseboard/Makefile.inc
@@ -1,5 +1,6 @@
bootblock-y += gpio.c
+romstage-y += gpio.c
romstage-y += memory.c
ramstage-y += gpio.c
diff --git a/src/mainboard/google/reef/variants/baseboard/gpio.c b/src/mainboard/google/reef/variants/baseboard/gpio.c
index aeb8edf999..e8b86001ec 100644
--- a/src/mainboard/google/reef/variants/baseboard/gpio.c
+++ b/src/mainboard/google/reef/variants/baseboard/gpio.c
@@ -392,6 +392,13 @@ variant_sleep_gpio_table(u8 slp_typ, size_t *num)
return sleep_gpio_table;
}
+/* Weak implementation of romstage gpio */
+const struct pad_config *__weak variant_romstage_gpio_table(size_t *num)
+{
+ *num = 0;
+ return NULL;
+}
+
static const struct cros_gpio cros_gpios[] = {
CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, GPIO_COMM_NW_NAME),
CROS_GPIO_WP_AH(PAD_NW(GPIO_PCH_WP), GPIO_COMM_NW_NAME),
diff --git a/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h
index c9b8b9d08e..5cf3e0da3b 100644
--- a/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h
@@ -16,6 +16,7 @@ const struct pad_config *variant_gpio_table(size_t *num);
const struct pad_config *variant_early_gpio_table(size_t *num);
const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num);
const struct pad_config *variant_sku_gpio_table(size_t *num);
+const struct pad_config *variant_romstage_gpio_table(size_t *num);
/* Baseboard default swizzle. Can be reused if swizzle is same. */
extern const struct lpddr4_swizzle_cfg baseboard_lpddr4_swizzle;