소스 검색

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>
Christophe Ricard 9 년 전
부모
커밋
0766ad2f7f

+ 2 - 2
README

@@ -1472,8 +1472,8 @@ The following options need to be configured:
 		CONFIG_TPM
 		CONFIG_TPM
 		Support TPM devices.
 		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.
 		per system is supported at this time.
 
 
 			CONFIG_TPM_TIS_I2C_BURST_LIMITATION
 			CONFIG_TPM_TIS_I2C_BURST_LIMITATION

+ 1 - 1
configs/nyan-big_defconfig

@@ -20,7 +20,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_DM_TPM=y
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DM_USB=y
 CONFIG_DISPLAY_PORT=y
 CONFIG_DISPLAY_PORT=y

+ 1 - 1
configs/peach-pi_defconfig

@@ -30,7 +30,7 @@ CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_SOUND_WM8994=y
 CONFIG_DM_TPM=y
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DM_USB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE=y

+ 1 - 1
configs/peach-pit_defconfig

@@ -30,7 +30,7 @@ CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_SOUND_WM8994=y
 CONFIG_DM_TPM=y
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DM_USB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE=y

+ 1 - 1
configs/snow_defconfig

@@ -39,7 +39,7 @@ CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_SOUND_WM8994=y
 CONFIG_DM_TPM=y
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DM_USB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE=y

+ 1 - 1
configs/spring_defconfig

@@ -39,7 +39,7 @@ CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_SOUND_WM8994=y
 CONFIG_DM_TPM=y
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DM_USB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE=y

+ 2 - 2
drivers/tpm/Kconfig

@@ -31,7 +31,7 @@ config TPM_ATMEL_TWI
 	  to the device using the standard TPM Interface Specification (TIS)
 	  to the device using the standard TPM Interface Specification (TIS)
 	  protocol
 	  protocol
 
 
-config TPM_TIS_I2C
+config TPM_TIS_INFINEON
 	bool "Enable support for Infineon SLB9635/45 TPMs on I2C"
 	bool "Enable support for Infineon SLB9635/45 TPMs on I2C"
 	depends on TPM && DM_I2C
 	depends on TPM && DM_I2C
 	help
 	help
@@ -42,7 +42,7 @@ config TPM_TIS_I2C
 
 
 config TPM_TIS_I2C_BURST_LIMITATION
 config TPM_TIS_I2C_BURST_LIMITATION
 	bool "Enable I2C burst length limitation"
 	bool "Enable I2C burst length limitation"
-	depends on TPM_TIS_I2C
+	depends on TPM_TIS_INFINEON
 	help
 	help
 	  Some broken TPMs have a limitation on the number of bytes they can
 	  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
 	  receive in one message. Enable this option to allow you to set this

+ 1 - 1
drivers/tpm/Makefile

@@ -6,6 +6,6 @@
 obj-$(CONFIG_DM_TPM) += tpm-uclass.o
 obj-$(CONFIG_DM_TPM) += tpm-uclass.o
 
 
 obj-$(CONFIG_TPM_ATMEL_TWI) += tpm_atmel_twi.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_LPC) += tpm_tis_lpc.o
 obj-$(CONFIG_TPM_TIS_SANDBOX) += tpm_tis_sandbox.o
 obj-$(CONFIG_TPM_TIS_SANDBOX) += tpm_tis_sandbox.o

+ 2 - 2
drivers/tpm/tpm_tis_i2c.c → drivers/tpm/tpm_tis_infineon.c

@@ -31,7 +31,7 @@
 #include <linux/types.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <linux/unaligned/be_byteshift.h>
 
 
-#include "tpm_tis_i2c.h"
+#include "tpm_tis_infineon.h"
 #include "tpm_internal.h"
 #include "tpm_internal.h"
 
 
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;
@@ -614,7 +614,7 @@ static const struct udevice_id tpm_tis_i2c_ids[] = {
 };
 };
 
 
 U_BOOT_DRIVER(tpm_tis_i2c) = {
 U_BOOT_DRIVER(tpm_tis_i2c) = {
-	.name   = "tpm_tis_i2c",
+	.name   = "tpm_tis_infineon",
 	.id     = UCLASS_TPM,
 	.id     = UCLASS_TPM,
 	.of_match = tpm_tis_i2c_ids,
 	.of_match = tpm_tis_i2c_ids,
 	.ops    = &tpm_tis_i2c_ops,
 	.ops    = &tpm_tis_i2c_ops,

+ 0 - 0
drivers/tpm/tpm_tis_i2c.h → drivers/tpm/tpm_tis_infineon.h