summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-10-06 22:54:41 +0200
committerSimon Glass <sjg@chromium.org>2015-10-23 09:42:28 -0600
commit0766ad2f7fdae6d7482b8e1e3f5a49b3d9a3810b (patch)
treeb195680d2489c42b3ab1431f52df3ca7037db836
parent8d1f3a9daf65baf756fe5ada1567710b476341e6 (diff)
downloadblackbird-obmc-uboot-0766ad2f7fdae6d7482b8e1e3f5a49b3d9a3810b.tar.gz
blackbird-obmc-uboot-0766ad2f7fdae6d7482b8e1e3f5a49b3d9a3810b.zip
dm: tpm: Move tpm_tis_i2c to tpm_i2c_infineon
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> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--README4
-rw-r--r--configs/nyan-big_defconfig2
-rw-r--r--configs/peach-pi_defconfig2
-rw-r--r--configs/peach-pit_defconfig2
-rw-r--r--configs/snow_defconfig2
-rw-r--r--configs/spring_defconfig2
-rw-r--r--drivers/tpm/Kconfig4
-rw-r--r--drivers/tpm/Makefile2
-rw-r--r--drivers/tpm/tpm_tis_infineon.c (renamed from drivers/tpm/tpm_tis_i2c.c)4
-rw-r--r--drivers/tpm/tpm_tis_infineon.h (renamed from drivers/tpm/tpm_tis_i2c.h)0
10 files changed, 12 insertions, 12 deletions
diff --git a/README b/README
index d18df54ec9..63bdeb9930 100644
--- a/README
+++ b/README
@@ -1472,8 +1472,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 2dd293007b..4f31c1c220 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 dfdf61b072..6eff072a13 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 01c4f37b09..24bc161374 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 c4e2f61e28..0c9ca8b5a4 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 4acadf34ef..47bc6438da 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 6bc8fddbd1..dacb847bdc 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 0d328f8d9d..5748145ad5 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
index 9afe46c1e9..88eb7869bc 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
index 3b510d101e..3b510d101e 100644
--- a/drivers/tpm/tpm_tis_i2c.h
+++ b/drivers/tpm/tpm_tis_infineon.h
OpenPOWER on IntegriCloud