]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'tpm-master-09082024' of https://source.denx.de/u-boot/custodians/u-boot...
authorTom Rini <trini@konsulko.com>
Fri, 9 Aug 2024 20:00:04 +0000 (14:00 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 9 Aug 2024 20:00:04 +0000 (14:00 -0600)
Back when the TPM subsystem was refactored tpm_tis_wait_init() ended up
being called after tpm_tis_init() which initializes values the former needs.

Since we added more TPM chipsets since then sitting on an i2c bus, this patch
folds in tpm_tis_wait_init into tpm_tis_init and makes sure it's called in the
right order regardless of the bus the TPM sits on.


Trivial merge