From: Tom Rini Date: Fri, 9 Aug 2024 20:00:04 +0000 (-0600) Subject: Merge tag 'tpm-master-09082024' of https://source.denx.de/u-boot/custodians/u-boot... X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/git-logo.png?a=commitdiff_plain;h=7bd2559cb30a4e800db519e88a22a25f13c753ec;p=u-boot.git Merge tag 'tpm-master-09082024' of https://source.denx.de/u-boot/custodians/u-boot-tpm.git 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. --- 7bd2559cb30a4e800db519e88a22a25f13c753ec