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>

diff --git a/README b/README
index d18df54ec9a14d662f4a6495b45aa92c61aa9962..63bdeb9930aeccc1dde1801845aa04609696698f 100644 (file)
--- 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 2dd293007b82528aa7cc02c9abd3be6ad99ef2e2..4f31c1c2203931759d431f9f204578f1b1147c89 100644 (file)
--- 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 dfdf61b07231bf06ba62f07fbc3cefd456d93e57..6eff072a13cf8aa4d24e179594b6a5a3059fbc15 100644 (file)
--- 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 01c4f37b093b3c55c3f573deb70a1849276fa918..24bc161374ee9c783992ca31c9184c3023b5e432 100644 (file)
--- 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 c4e2f61e28f98ca6843a4e19a16e4793a3d1763f..0c9ca8b5a41ed803447b56e05e1c63b6b1e188ff 100644 (file)
--- 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 4acadf34ef893c8f8910f61fd0cff611d2c07ca8..47bc6438dada031ad341242d21c6173ea361e9df 100644 (file)
--- 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 6bc8fddbd16b7368d2b43e611e0cac01935c2f47..dacb847bdc344182e2b47c0c5d8296d58cbf54a5 100644 (file)
--- 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 0d328f8d9d35110a0037400e71ea51a4df7906dc..5748145ad59e5ba44eb3d1da68a55afd4a060724 100644 (file)
--- 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 9afe46c1e90c28cd7f321be876eaf51c447260f8..88eb7869bcd339c8fcd9860affae9cc4d513d8d1 100644 (file)
--- 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