| Message ID | 1444164885-29243-2-git-send-email-christophe-h.ricard@st.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 6 October 2015 at 21:54, Christophe Ricard <christophe.ricard@gmail.com> wrote: > As there is no TCG specification or recommendation for i2c TPM 1.2, > move tpm_tis_i2c driver to tpm_i2c_infineon. Other tpm vendors like Atmel > or STMicroelectronics may have a different transport protocol for i2c. > > Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> > Reviewed-by: Tom Rini <trini@konsulko.com> > --- > > Changes in v4: > - Fix compilation issues reported by Simon Glass on > - patch 2: dm: tpm: Add Driver Model support for tpm_atmel_twi driver > - patch 3: dm: tpm: Remove every compilation switch for TPM driver model > > Changes in v3: > - Adding mention to Tom Rini review > > Changes in v2: > - Change existing users of config to use renamed Kconfig > > README | 4 ++-- > configs/nyan-big_defconfig | 2 +- > configs/peach-pi_defconfig | 2 +- > configs/peach-pit_defconfig | 2 +- > configs/snow_defconfig | 2 +- > configs/spring_defconfig | 2 +- > drivers/tpm/Kconfig | 4 ++-- > drivers/tpm/Makefile | 2 +- > drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} | 4 ++-- > drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} | 0 > 10 files changed, 12 insertions(+), 12 deletions(-) > rename drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} (99%) > rename drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} (100%) Acked-by: Simon Glass <sjg@chromium.org>
On 8 October 2015 at 15:45, Simon Glass <sjg@chromium.org> wrote: > On 6 October 2015 at 21:54, Christophe Ricard > <christophe.ricard@gmail.com> wrote: >> As there is no TCG specification or recommendation for i2c TPM 1.2, >> move tpm_tis_i2c driver to tpm_i2c_infineon. Other tpm vendors like Atmel >> or STMicroelectronics may have a different transport protocol for i2c. >> >> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> >> Reviewed-by: Tom Rini <trini@konsulko.com> >> --- >> >> Changes in v4: >> - Fix compilation issues reported by Simon Glass on >> - patch 2: dm: tpm: Add Driver Model support for tpm_atmel_twi driver >> - patch 3: dm: tpm: Remove every compilation switch for TPM driver model >> >> Changes in v3: >> - Adding mention to Tom Rini review >> >> Changes in v2: >> - Change existing users of config to use renamed Kconfig >> >> README | 4 ++-- >> configs/nyan-big_defconfig | 2 +- >> configs/peach-pi_defconfig | 2 +- >> configs/peach-pit_defconfig | 2 +- >> configs/snow_defconfig | 2 +- >> configs/spring_defconfig | 2 +- >> drivers/tpm/Kconfig | 4 ++-- >> drivers/tpm/Makefile | 2 +- >> drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} | 4 ++-- >> drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} | 0 >> 10 files changed, 12 insertions(+), 12 deletions(-) >> rename drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} (99%) >> rename drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} (100%) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm, thanks!
diff --git a/README b/README index c22b60b..48ea80d 100644 --- a/README +++ b/README @@ -1478,8 +1478,8 @@ The following options need to be configured: CONFIG_TPM Support TPM devices. - CONFIG_TPM_TIS_I2C - Support for i2c bus TPM devices. Only one device + CONFIG_TPM_TIS_INFINEON + Support for Infineon i2c bus TPM devices. Only one device per system is supported at this time. CONFIG_TPM_TIS_I2C_BURST_LIMITATION diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 2dd2930..4f31c1c 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -20,7 +20,7 @@ CONFIG_CROS_EC_SPI=y CONFIG_SPI_FLASH=y CONFIG_TEGRA114_SPI=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_DISPLAY_PORT=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index dfdf61b..6eff072 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -30,7 +30,7 @@ CONFIG_I2S_SAMSUNG=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_VIDEO_BRIDGE=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 01c4f37..24bc161 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -30,7 +30,7 @@ CONFIG_I2S_SAMSUNG=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_VIDEO_BRIDGE=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index c4e2f61..0c9ca8b 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -39,7 +39,7 @@ CONFIG_I2S_SAMSUNG=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_VIDEO_BRIDGE=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 4acadf3..47bc643 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -39,7 +39,7 @@ CONFIG_I2S_SAMSUNG=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_VIDEO_BRIDGE=y diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig index 6bc8fdd..dacb847 100644 --- a/drivers/tpm/Kconfig +++ b/drivers/tpm/Kconfig @@ -31,7 +31,7 @@ config TPM_ATMEL_TWI to the device using the standard TPM Interface Specification (TIS) protocol -config TPM_TIS_I2C +config TPM_TIS_INFINEON bool "Enable support for Infineon SLB9635/45 TPMs on I2C" depends on TPM && DM_I2C help @@ -42,7 +42,7 @@ config TPM_TIS_I2C config TPM_TIS_I2C_BURST_LIMITATION bool "Enable I2C burst length limitation" - depends on TPM_TIS_I2C + depends on TPM_TIS_INFINEON help Some broken TPMs have a limitation on the number of bytes they can receive in one message. Enable this option to allow you to set this diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile index 0d328f8..5748145 100644 --- a/drivers/tpm/Makefile +++ b/drivers/tpm/Makefile @@ -6,6 +6,6 @@ obj-$(CONFIG_DM_TPM) += tpm-uclass.o obj-$(CONFIG_TPM_ATMEL_TWI) += tpm_atmel_twi.o -obj-$(CONFIG_TPM_TIS_I2C) += tpm_tis_i2c.o +obj-$(CONFIG_TPM_TIS_INFINEON) += tpm_tis_infineon.o obj-$(CONFIG_TPM_TIS_LPC) += tpm_tis_lpc.o obj-$(CONFIG_TPM_TIS_SANDBOX) += tpm_tis_sandbox.o diff --git a/drivers/tpm/tpm_tis_i2c.c b/drivers/tpm/tpm_tis_infineon.c similarity index 99% rename from drivers/tpm/tpm_tis_i2c.c rename to drivers/tpm/tpm_tis_infineon.c index 9afe46c..88eb786 100644 --- a/drivers/tpm/tpm_tis_i2c.c +++ b/drivers/tpm/tpm_tis_infineon.c @@ -31,7 +31,7 @@ #include <linux/types.h> #include <linux/unaligned/be_byteshift.h> -#include "tpm_tis_i2c.h" +#include "tpm_tis_infineon.h" #include "tpm_internal.h" DECLARE_GLOBAL_DATA_PTR; @@ -614,7 +614,7 @@ static const struct udevice_id tpm_tis_i2c_ids[] = { }; U_BOOT_DRIVER(tpm_tis_i2c) = { - .name = "tpm_tis_i2c", + .name = "tpm_tis_infineon", .id = UCLASS_TPM, .of_match = tpm_tis_i2c_ids, .ops = &tpm_tis_i2c_ops, diff --git a/drivers/tpm/tpm_tis_i2c.h b/drivers/tpm/tpm_tis_infineon.h similarity index 100% rename from drivers/tpm/tpm_tis_i2c.h rename to drivers/tpm/tpm_tis_infineon.h