kahlee: Enable LPC TPM

BRANCH=none
BUG=b:62103024
TEST=Depthcharge reports TPM found.

Change-Id: I35b4643567a3c380e14266678e9882eb271ef59c
Signed-off-by: Marc Jones <marcj303@gmail.com>
Signed-off-by: Marc Jones <marc.jones@scarletltd.com>
Reviewed-on: https://chromium-review.googlesource.com/528493
Commit-Ready: Martin Roth <martinroth@chromium.org>
Tested-by: Martin Roth <martinroth@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
diff --git a/board/kahlee/defconfig b/board/kahlee/defconfig
index d85e5a5..3300985 100644
--- a/board/kahlee/defconfig
+++ b/board/kahlee/defconfig
@@ -17,7 +17,6 @@
 CONFIG_KERNEL_ZIMAGE=y
 
 # Drivers
-CONFIG_MOCK_TPM=y
 CONFIG_DRIVER_EC_CROS=y
 CONFIG_DRIVER_EC_CROS_LPC=y
 CONFIG_DRIVER_FLASH_MEMMAPPED=y
@@ -26,5 +25,5 @@
 CONFIG_DRIVER_INPUT_USB=y
 CONFIG_DRIVER_POWER_FCH=y
 CONFIG_DRIVER_AHCI=y
-CONFIG_DRIVER_TPM_SPI=y
+CONFIG_DRIVER_TPM_LPC=y
 CONFIG_DRIVER_SOUND_HDA=y
diff --git a/src/board/kahlee/board.c b/src/board/kahlee/board.c
index 572f94d..e9b97df 100644
--- a/src/board/kahlee/board.c
+++ b/src/board/kahlee/board.c
@@ -27,6 +27,7 @@
 #include "drivers/sound/sound.h"
 #include "drivers/storage/ahci.h"
 #include "drivers/storage/blockdev.h"
+#include "drivers/tpm/lpc.h"
 #include "drivers/bus/usb/usb.h"
 #include "vboot/util/flag.h"
 
@@ -65,6 +66,8 @@
 
 	power_set_ops(&kern_power_ops);
 
+	tpm_set_ops(&new_lpc_tpm((void *)(uintptr_t)0xfed40000)->ops);
+
 	return 0;
 }