[coreboot-gerrit] Change in coreboot[master]: mb/google/zork: Add func fpmcu_needs_delay

[Martin Roth (Code Review)]

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47369 )

Change subject: mb/google/zork: Add func fpmcu_needs_delay
......................................................................

mb/google/zork: Add func fpmcu_needs_delay

This adds a function to tell if boards need an extra delay for the
FPMCU's reset logic.

BUG=b:171837716
TEST=Boot on early board, see extra delay
BRANCH=Zork

Signed-off-by: Martin Roth 
Change-Id: I60eec69aff0715b23fdf8ec695674f708fb37bcc
---
M src/mainboard/google/zork/variants/baseboard/helpers.c
M src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
M src/mainboard/google/zork/variants/berknip/variant.c
M src/mainboard/google/zork/variants/morphius/variant.c
4 files changed, 37 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/47369/1

diff --git a/src/mainboard/google/zork/variants/baseboard/helpers.c b/src/mainboard/google/zork/variants/baseboard/helpers.c
index 624d1b2..2fc2bde 100644
--- a/src/mainboard/google/zork/variants/baseboard/helpers.c
+++ b/src/mainboard/google/zork/variants/baseboard/helpers.c
@@ -155,5 +155,9 @@
    /* Default to no fingerprint sensor */
    return 0;
 }
+
+__weak int fpmcu_needs_delay(void)
+{
+	/* Default to no delay */
    return 0;
 }
diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
index 4ba7843..054094a 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
@@ -33,6 +33,9 @@
 /* Return 1 if the board has a fingerprint sensor.  Return 0 otherwise */
 int variant_has_fingerprint(void);

+/* Return 1 if the board has an FPMCU that needs an extra delay.  Return 0 otherwise. */
+int fpmcu_needs_delay(void);
+
 /* Modify devictree settings during ramstage. */
 void variant_devtree_update(void);
 /* Update audio configuration in devicetree during ramstage. */
diff --git a/src/mainboard/google/zork/variants/berknip/variant.c b/src/mainboard/google/zork/variants/berknip/variant.c
index aba5527..714063b 100644
--- a/src/mainboard/google/zork/variants/berknip/variant.c
+++ b/src/mainboard/google/zork/variants/berknip/variant.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */

#include <baseboard/variants.h>
+#include <ec/google/chromeec/ec.h>

void variant_devtree_update(void)
 {
@@ -20,3 +21,17 @@
 {
    return 1;
 }
+
+int fpmcu_needs_delay(void)
+{
+	uint32_t board_version;
+
+	if (google_chromeec_cbi_get_board_version(&board_version))
+		board_version = 1;
+
+	/* The FPMCU on early boards needs an extra delay */
+	if (board_version <= 3)
+		return 1;
+
+	return 0;
+}
diff --git a/src/mainboard/google/zork/variants/morphius/variant.c b/src/mainboard/google/zork/variants/morphius/variant.c
index 2e7ed8a..bf61396 100644
--- a/src/mainboard/google/zork/variants/morphius/variant.c
+++ b/src/mainboard/google/zork/variants/morphius/variant.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */

#include <baseboard/variants.h>
+#include <ec/google/chromeec/ec.h>

void variant_devtree_update(void)
 {
@@ -20,3 +21,17 @@
    /* All Morphius SKUs have a fingerprint sensor */
    return 1;
 }
+
+int fpmcu_needs_delay(void)
+{
+	uint32_t board_version;
+
+	if (google_chromeec_cbi_get_board_version(&board_version))
+		board_version = 1;
+
+	/* The FPMCU on early boards needs an extra delay */
+	if (board_version <= 4)
+		return 1;
+
+	return 0;
+}