From 5bdf46b71b26263d090ccdb1c6679afd085f0323 Mon Sep 17 00:00:00 2001 From: Tom Wai-Hong Tam Date: Fri, 12 Apr 2013 11:04:35 +0000 Subject: x86: config: Reflect the name changes of LPC TPM configs The new name is more aligned with Linux kernel's naming of TPM driver. Signed-off-by: Tom Wai-Hong Tam Signed-off-by: Simon Glass Reviewed-by: Simon Glass --- include/configs/coreboot.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index be04a75..2fefdc8 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -90,7 +90,8 @@ #endif /* Generic TPM interfaced through LPC bus */ -#define CONFIG_GENERIC_LPC_TPM +#define CONFIG_TPM +#define CONFIG_TPM_TIS_LPC #define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000 /*----------------------------------------------------------------------- -- cgit v1.1 From ec34fa5e43bfbef5a93394db04ff3b03fdfe3f44 Mon Sep 17 00:00:00 2001 From: Vincent Palatin Date: Fri, 12 Apr 2013 11:04:36 +0000 Subject: tpm: Add support for new Infineon I2C TPM (SLB 9645 TT 1.2 I2C) Add support for Infineon's new SLB 9645 TT 1.2 I2C TPMs, which supports clockstretching, combined reads and a bus speed of up to 400khz. The device also has a new device id. This is based on the kernel patch provided by Infineon : https://gerrit.chromium.org/gerrit/42332 Signed-off-by: Vincent Palatin Signed-off-by: Simon Glass Reviewed-by: Luigi Semenzato Reviewed-by: Simon Glass Reviewed-by: Vincent Palatin Tested-by: Tom Wai-Hong Tam Tested-by: Vincent Palatin --- include/fdtdec.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/fdtdec.h b/include/fdtdec.h index 4e8032b..1ece612 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -93,6 +93,7 @@ enum fdt_compat_id { COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */ COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ COMPAT_INFINEON_SLB9635_TPM, /* Infineon SLB9635 TPM */ + COMPAT_INFINEON_SLB9645_TPM, /* Infineon SLB9645 TPM */ COMPAT_COUNT, }; -- cgit v1.1 From 1b393db5870927d68c42a46e6c5877c8d0d83910 Mon Sep 17 00:00:00 2001 From: Tom Wai-Hong Tam Date: Fri, 12 Apr 2013 11:04:37 +0000 Subject: tpm: Reorganize the I2C TPM driver This patch does a similar code reogranzation from http://patchwork.ozlabs.org/patch/132179/ which is based on an old version of code (fdt support and bus selection still not in). It merges this tidy-up on top of the recent code. It does not make any logical change. tpm.c implements the interface defined in tpm.h based on underlying LPC or I2C TPM driver. tpm.c and the underlying driver communicate throught tpm_private.h. Note: Merging the LPC driver with tpm.c is left to future patches. Change-Id: Ie1384f5f9e3935d3bc9a44adf8de80c5a70a5f2b Signed-off-by: Tom Wai-Hong Tam Signed-off-by: Simon Glass Reviewed-by: Simon Glass --- include/configs/exynos5250-dt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 8a82892..41d6cf9 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -142,9 +142,9 @@ /* TPM */ #define CONFIG_TPM #define CONFIG_CMD_TPM -#define CONFIG_INFINEON_TPM_I2C -#define CONFIG_INFINEON_TPM_I2C_BUS 3 -#define CONFIG_INFINEON_TPM_I2C_ADDR 0x20 +#define CONFIG_TPM_TIS_I2C +#define CONFIG_TPM_TIS_I2C_BUS_NUMBER 3 +#define CONFIG_TPM_TIS_I2C_SLAVE_ADDR 0x20 /* MMC SPL */ #define CONFIG_SPL -- cgit v1.1