From 37fee37ceab25dae8b1e9d9ebffedcc00b1e7420 Mon Sep 17 00:00:00 2001
From: Sean Rhodes <sean@starlabs.systems>
Date: Wed, 28 Jan 2026 22:23:40 +0000
Subject: [PATCH] Revert "ec/starlabs/merlin: Add retry to get_ec_version()"

This reverts commit 60c8496afe6e43901c774ac180965125c805fbc4.

The reason for needing that was the EC initialising PM1DO to 0
on reset, which set the OBF flag, leading to coreboot consuming
0 on it's first read.

This issue has now been fixed, so the rety is no longer needed.

Change-Id: I87b779e3859daecfe6285cd499e8d6b61cdbb852
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90979
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/ec/starlabs/merlin/ite.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c
index ec4c9a65ab..953c9e3de6 100644
--- a/src/ec/starlabs/merlin/ite.c
+++ b/src/ec/starlabs/merlin/ite.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
-#include <delay.h>
 #include <device/device.h>
 #include <device/pnp.h>
 #include <ec/acpi/ec.h>
@@ -18,9 +17,6 @@
 
 uint16_t ec_get_version(void)
 {
-	for (int i = 0; i < 10 && ec_read(ECRAM_MAJOR_VERSION) == 0; i++)
-		mdelay(10);
-
 	return (ec_read(ECRAM_MAJOR_VERSION) << 8) | ec_read(ECRAM_MINOR_VERSION);
 }