Michał Żygowski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82057?usp=email )
Change subject: drivers/crb,pc80/tpm: Add crb and pc80 prefixes to chip configs ......................................................................
drivers/crb,pc80/tpm: Add crb and pc80 prefixes to chip configs
Avoid tpm_config_t type redefinition by adding crb and pc80 prefixes.
TEST=Compile MSI PRO Z690-A target with CRB and PC80 TPM chips enabled in devicetree.
Change-Id: Id41717e265362303a17745303a907c9c8f4f4e12 Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com --- M src/drivers/crb/chip.h M src/drivers/pc80/tpm/chip.h M src/drivers/pc80/tpm/tis.c 3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/82057/1
diff --git a/src/drivers/crb/chip.h b/src/drivers/crb/chip.h index f0e471f..8fd32d9 100644 --- a/src/drivers/crb/chip.h +++ b/src/drivers/crb/chip.h @@ -4,6 +4,6 @@ #define DRIVERS_CRB_CHIP_H
typedef struct drivers_crb_config { -} tpm_config_t; +} crb_tpm_config_t;
#endif /* DRIVERS_CRB_CHIP_H */ diff --git a/src/drivers/pc80/tpm/chip.h b/src/drivers/pc80/tpm/chip.h index af73153..cc842ff 100644 --- a/src/drivers/pc80/tpm/chip.h +++ b/src/drivers/pc80/tpm/chip.h @@ -13,6 +13,6 @@ * Falling Edge 3 */ u8 irq_polarity; -} tpm_config_t; +} pc80_tpm_config_t;
#endif /* DRIVERS_PC80_TPM_CHIP_H */ diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index d811c52..635dc7b 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/src/drivers/pc80/tpm/tis.c @@ -779,7 +779,7 @@
static void lpc_tpm_set_resources(struct device *dev) { - tpm_config_t *config = (tpm_config_t *)dev->chip_info; + pc80_tpm_config_t *config = (pc80_tpm_config_t *)dev->chip_info; DEVTREE_CONST struct resource *res;
for (res = dev->resource_list; res; res = res->next) {