drivers/i2c/tpm: splice tpm_vendor_specific struct

Move `locality` field to `struct tpm_inf_dev` and put the rest directly
into `tpm_chip`.

Change-Id: Ic3644290963aca9f8dc7cd8ef754352865ef8d2c
Ticket: https://ticket.coreboot.org/issues/433
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68990
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

1 files changed, 6 insertions, 12 deletions

diff --git a/src/drivers/i2c/tpm/tpm.h b/src/drivers/i2c/tpm/tpm.h
index 868b306c36..d4176cc511 100644
--- a/src/drivers/i2c/tpm/tpm.h
+++ b/src/drivers/i2c/tpm/tpm.h
@@ -37,22 +37,16 @@ enum tpm_timeout {
 #define	TPM_DATA_FIFO(l)		(0x0005 | ((l) << 4))
 #define	TPM_DID_VID(l)			(0x0006 | ((l) << 4))
 
-struct tpm_chip;
-
-struct tpm_vendor_specific {
+struct tpm_chip {
+	int is_open;
 	uint8_t req_complete_mask;
 	uint8_t req_complete_val;
 	uint8_t req_canceled;
-	int (*recv)(struct tpm_chip *, uint8_t *, size_t);
-	int (*send)(struct tpm_chip *, uint8_t *, size_t);
-	void (*cancel)(struct tpm_chip *);
-	uint8_t (*status)(struct tpm_chip *);
-	int locality;
-};
 
-struct tpm_chip {
-	int is_open;
-	struct tpm_vendor_specific vendor;
+	int (*recv)(uint8_t *buf, size_t len);
+	int (*send)(uint8_t *buf, size_t len);
+	void (*cancel)(void);
+	uint8_t (*status)(void);
 };
 
 /* ---------- Interface for TPM vendor ------------ */