diff --git a/arch/arm/configs/gfsc100_defconfig b/arch/arm/configs/gfsc100_defconfig
index 2b60402..bc367ce 100644
--- a/arch/arm/configs/gfsc100_defconfig
+++ b/arch/arm/configs/gfsc100_defconfig
@@ -211,6 +211,8 @@
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 # CONFIG_HW_RANDOM is not set
+CONFIG_TCG_TPM=y
+CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
diff --git a/arch/arm/mach-comcerto/board-optimus.c b/arch/arm/mach-comcerto/board-optimus.c
index bfe855a..7697b80 100644
--- a/arch/arm/mach-comcerto/board-optimus.c
+++ b/arch/arm/mach-comcerto/board-optimus.c
@@ -416,7 +416,7 @@
 	},
 #if defined(CONFIG_GOOGLE_SPACECAST)
 	{
-		I2C_BOARD_INFO("slb9645", 0x20),
+		I2C_BOARD_INFO("tpm_i2c_infineon", 0x20),
 	},
 	{
 		I2C_BOARD_INFO("tps65233", 0x60),
diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
index 37d5dcc..ee41671 100644
--- a/drivers/char/tpm/tpm_i2c_infineon.c
+++ b/drivers/char/tpm/tpm_i2c_infineon.c
@@ -787,7 +787,11 @@
 		   },
 };
 
-module_i2c_driver(tpm_tis_i2c_driver);
+static int __init tpm_tis_i2c_module_register(void)
+{
+	i2c_add_driver(&tpm_tis_i2c_driver);
+}
+module_init(tpm_tis_i2c_module_register);
 MODULE_AUTHOR("Peter Huewe <peter.huewe@infineon.com>");
 MODULE_DESCRIPTION("TPM TIS I2C Infineon Driver");
 MODULE_VERSION("2.2.0");
diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index 156bd3c..9b0ae29 100644
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -882,7 +882,11 @@
 	.id_table = tpm_st33_i2c_id
 };
 
-module_i2c_driver(tpm_st33_i2c_driver);
+static int __init tpm_st33_i2c_module_register(void)
+{
+        i2c_add_driver(&tpm_st33_i2c_driver);
+}
+module_init(tpm_st33_i2c_module_register);
 
 MODULE_AUTHOR("Christophe Ricard (tpmsupport@st.com)");
 MODULE_DESCRIPTION("STM TPM I2C ST33 Driver");