ec/starlabs/merlin: Remove ITE mirror functionality

Remove the ITE mirror functionality; all devices will mirror
automatically when they exit G3, and this is good enough.

Change-Id: I9b82e1b1386b4607dfe7da9b25ba432ec0303cf8
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83629
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

3 files changed, 0 insertions, 49 deletions

diff --git a/src/ec/starlabs/merlin/Kconfig b/src/ec/starlabs/merlin/Kconfig
index 5a35b51b9e..9f05991061 100644
--- a/src/ec/starlabs/merlin/Kconfig
+++ b/src/ec/starlabs/merlin/Kconfig
@@ -64,20 +64,6 @@ config EC_STARLABS_MAX_CHARGE
 	help
 	  Select if the mainboard supports limiting the maximum charge of the battery.
 
-config EC_STARLABS_MIRROR_SUPPORT
-	bool "Enable mirror flag support"
-	default n
-	depends on EC_STARLABS_ITE
-	help
-	  Select if the EC should mirror the EC firmware contained in the coreboot ROM.
-
-config EC_STARLABS_MIRROR_VERSION
-	hex "Version of the EC firmware that should be installed."
-	depends on EC_STARLABS_MIRROR_SUPPORT
-	help
-	  The version of the EC that should be installed. The mirror flag will be activated
-	  if this Kconfig option is set and it does not match the current EC version.
-
 config EC_STARLABS_MERLIN
 	bool "Use open-source Merlin EC Firmware"
 	default n
diff --git a/src/ec/starlabs/merlin/ec.h b/src/ec/starlabs/merlin/ec.h
index 05288165fd..ca1d081f0c 100644
--- a/src/ec/starlabs/merlin/ec.h
+++ b/src/ec/starlabs/merlin/ec.h
@@ -98,11 +98,6 @@
 #define KBL_DISABLED		0x00
 #define KBL_ENABLED		0xdd
 
-/* Mirror Flag */
-#define MIRROR_DISABLED		0x00
-#define MIRROR_ENABLED		0xaa
-
 uint16_t ec_get_version(void);
-void ec_mirror_flag(void);
 
 #endif
diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c
index c4e0d1ec04..031447a716 100644
--- a/src/ec/starlabs/merlin/ite.c
+++ b/src/ec/starlabs/merlin/ite.c
@@ -25,34 +25,6 @@ static uint8_t get_ec_value_from_option(const char *name,
 	return lut[index];
 }
 
-void ec_mirror_flag(void)
-{
-	/*
-	 * For the mirror flag to work, the status of the EC pin must be known
-	 * at all times, which means external power. This can be either a DC
-	 * charger, or PD with CCG6. PD with an ANX7447 requires configuration
-	 * from the EC, so the update will interrupt this.
-	 *
-	 * This means we can unconditionally apply the mirror flag to devices
-	 * that have CCG6, present on devices with TBT, but have a manual
-	 * flag for devices without it.
-	 */
-	uint16_t ec_version = ec_get_version();
-
-	/* Full mirror support was added in EC 1.18 (0x0112) */
-	if (ec_version < 0x0112)
-		return;
-
-	if (CONFIG(EC_STARLABS_MIRROR_SUPPORT) &&
-		(CONFIG(DRIVERS_INTEL_USB4_RETIMER) || get_uint_option("mirror_flag", 0)) &&
-		(ec_version != CONFIG_EC_STARLABS_MIRROR_VERSION)) {
-		printk(BIOS_ERR, "ITE: EC version 0x%x doesn't match coreboot version 0x%x.\n",
-			ec_version, CONFIG_EC_STARLABS_MIRROR_VERSION);
-
-		ec_write(ECRAM_MIRROR_FLAG, MIRROR_ENABLED);
-	}
-}
-
 static uint16_t ec_get_chip_id(unsigned int port)
 {
 	return (pnp_read_index(port, ITE_CHIPID1) << 8) |
@@ -84,8 +56,6 @@ static void merlin_init(struct device *dev)
 		return;
 	}
 
-	ec_mirror_flag();
-
 	/*
 	 * Restore settings from CMOS into EC RAM:
 	 *