Merge branch pull request #12 into aspeed-dev-v2019.04

Change-Id: I66c2fc09c21405c34f65d5be9e8c661e62bfae45
openbmc · Jul 28, 2022 · d96d7db · d96d7db
2 parents 64e8c66 + 4f03044
commit d96d7db
Show file tree

Hide file tree

Showing 7 changed files with 828 additions and 5 deletions.
diff --git a/arch/arm/dts/ast2600-rainier.dts b/arch/arm/dts/ast2600-rainier.dts
@@ -106,12 +106,14 @@
 
 &gpio0 {
  u-boot,dm-pre-reloc;
+};
+
+&i2c12 {
+ status = "okay";
 
- tpm_reset {
- u-boot,dm-pre-reloc;
- gpio-hog;
- output-high;
- gpios = <ASPEED_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
+ tpm@2e {
+ compatible = "nuvoton,npct75x";
+ reg = <0x2e>;
  };
 };
 

diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig
@@ -145,6 +145,15 @@ config TPM2_TIS_SPI
  to the device using the standard TPM Interface Specification (TIS)
  protocol.
 
+config TPM2_TIS_I2C
+ bool "Enable support for TPMv2.x I2C chips"
+ depends on TPM_V2 && DM_I2C
+ help
+ This driver supports TPMv2.x devices connected on the I2C bus.
+ The usual TPM operations and the 'tpm' command can be used to talk
+ to the device using the standard TPM Interface Specification (TIS)
+ protocol.
+
 endif # TPM_V2
 
 endmenu
diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_TPM_ST33ZP24_SPI) += tpm_tis_st33zp24_spi.o
 
 obj-$(CONFIG_TPM2_TIS_SANDBOX) += tpm2_tis_sandbox.o
 obj-$(CONFIG_TPM2_TIS_SPI) += tpm2_tis_spi.o
+obj-$(CONFIG_TPM2_TIS_I2C) += tpm2_tis_core.o tpm2_tis_i2c.o