diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-08 20:20:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-08 20:20:24 -0400 |
| commit | 61608f395e7dcb2be6060407a72a1149b046430a (patch) | |
| tree | 387269e837a47126d5a7ccdef2b4d5af60598e16 /drivers/tpm | |
| parent | 186529953fd10a97e6343418095edd1c535aaeb2 (diff) | |
| parent | c89b41b4db4a746647c4f0e6d33c6f4edfe96e38 (diff) | |
Merge branch '2020-07-08-misc-features-and-fixes'
- mem cmd improvements
- TPM fixes
- SPL/NAND/FIT fixes
- RSA improvements
Diffstat (limited to 'drivers/tpm')
| -rw-r--r-- | drivers/tpm/tpm2_tis_spi.c | 2 | ||||
| -rw-r--r-- | drivers/tpm/tpm_tis.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c index 36016de4a6..9a8145e6ba 100644 --- a/drivers/tpm/tpm2_tis_spi.c +++ b/drivers/tpm/tpm2_tis_spi.c @@ -676,7 +676,7 @@ static const struct tpm_tis_chip_data tpm_tis_std_chip_data = { static const struct udevice_id tpm_tis_spi_ids[] = { { - .compatible = "tis,tpm2-spi", + .compatible = "tcg,tpm_tis-spi", .data = (ulong)&tpm_tis_std_chip_data, }, { } diff --git a/drivers/tpm/tpm_tis.h b/drivers/tpm/tpm_tis.h index 947585f8e3..2a160fe05c 100644 --- a/drivers/tpm/tpm_tis.h +++ b/drivers/tpm/tpm_tis.h @@ -104,6 +104,7 @@ struct tpm_cmd_t { /* Max number of iterations after i2c NAK */ #define MAX_COUNT 3 +#ifndef __TPM_V2_H /* * Max number of iterations after i2c NAK for 'long' commands * @@ -127,5 +128,6 @@ enum tis_status { TPM_STS_DATA_AVAIL = 0x10, TPM_STS_DATA_EXPECT = 0x08, }; +#endif #endif |