From a0bd3e9a972908c428677b2c1541d16ddf9e77a0 Mon Sep 17 00:00:00 2001
From: Grzegorz Bernacki <bernacki@google.com>
Date: Mon, 29 May 2023 11:53:38 +0000
Subject: mb/google: AMD: move tpm_tis to AMD common code

It moves cr50_plat_irq_status() to common code and adds Kconfig
option to specify GPIO used for interrupt.

BUG=b:277787305
TEST=Build all affected platform and confirm using right GPIO
number. Tested on Skyrim.

Change-Id: I775c4e24cffee99b6ac3e05b58a75425029a86c8
Signed-off-by: Grzegorz Bernacki <bernacki@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75621
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
---
 src/mainboard/google/myst/Kconfig                         | 4 ++++
 src/mainboard/google/myst/variants/baseboard/Makefile.inc | 3 ---
 src/mainboard/google/myst/variants/baseboard/tpm_tis.c    | 9 ---------
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 src/mainboard/google/myst/variants/baseboard/tpm_tis.c

(limited to 'src/mainboard/google/myst')

diff --git a/src/mainboard/google/myst/Kconfig b/src/mainboard/google/myst/Kconfig
index bfa4d03be3..3680e18e6b 100644
--- a/src/mainboard/google/myst/Kconfig
+++ b/src/mainboard/google/myst/Kconfig
@@ -44,6 +44,10 @@ config DRIVER_TPM_I2C_ADDR
 	hex
 	default 0x50
 
+config GSC_IRQ_GPIO
+	int
+	default 84
+
 config FMDFILE
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd"
 
diff --git a/src/mainboard/google/myst/variants/baseboard/Makefile.inc b/src/mainboard/google/myst/variants/baseboard/Makefile.inc
index 74839fa863..9e9ec0dc53 100644
--- a/src/mainboard/google/myst/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/myst/variants/baseboard/Makefile.inc
@@ -2,12 +2,9 @@ bootblock-y += gpio.c
 
 ramstage-$(CONFIG_FW_CONFIG) += fw_config.c
 ramstage-y += gpio.c
-ramstage-y += tpm_tis.c
 
 romstage-y += gpio.c
-romstage-y += tpm_tis.c
 
-verstage-y += tpm_tis.c
 verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += gpio.c
 
 smm-y += smihandler.c
diff --git a/src/mainboard/google/myst/variants/baseboard/tpm_tis.c b/src/mainboard/google/myst/variants/baseboard/tpm_tis.c
deleted file mode 100644
index 3641e7abd9..0000000000
--- a/src/mainboard/google/myst/variants/baseboard/tpm_tis.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <drivers/tpm/cr50.h>
-#include <gpio.h>
-
-int cr50_plat_irq_status(void)
-{
-	return gpio_interrupt_status(GPIO_84);
-}
-- 
cgit v1.2.3