3 files changed, 14 insertions, 16 deletions
diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig
index 3431de1988..ef7c89af2e 100644
--- a/src/mainboard/system76/lemp9/Kconfig
+++ b/src/mainboard/system76/lemp9/Kconfig
@@ -10,9 +10,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select GENERIC_SPD_BIN
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
-# Chip select 2 is not yet supported by intel fast_spi
-#	select MAINBOARD_HAS_SPI_TPM_CR50
-#	select MAINBOARD_HAS_TPM2
+	select MAINBOARD_HAS_LPC_TPM
+	select MAINBOARD_HAS_TPM2
 	select NO_UART_ON_SUPERIO
 	select SOC_INTEL_COMETLAKE
 	select SOC_INTEL_COMMON_BLOCK_HDA
@@ -77,17 +76,12 @@ config VGA_BIOS_ID
 	string
 	default "8086,9b41"
 
+config TPM_PIRQ
+	hex
+	default 0x10 # GPP_A7/PIRQA#
+
 config POST_DEVICE
 	bool
 	default n
 
-# Chip select 2 is not yet supported by intel fast_spi
-#config DRIVER_TPM_SPI_BUS
-#	hex
-#	default 0x0
-#
-#config DRIVER_TPM_SPI_CHIP
-#	int
-#	default 2
-
 endif
diff --git a/src/mainboard/system76/lemp9/devicetree.cb b/src/mainboard/system76/lemp9/devicetree.cb
index 659ca89475..d00f20358a 100644
--- a/src/mainboard/system76/lemp9/devicetree.cb
+++ b/src/mainboard/system76/lemp9/devicetree.cb
@@ -238,12 +238,16 @@ chip soc/intel/cannonlake
 		device pci 1e.1 off end # UART #1
 		device pci 1e.2 off end # GSPI #0
 		device pci 1e.3 off end # GSPI #1
-		device pci 1f.0 on  end # LPC Interface
+		device pci 1f.0 on	# LPC Interface
+			chip drivers/pc80/tpm	# TPM
+				device pnp 0c31.0 on  end
+			end
+		end
 		device pci 1f.1 off end # P2SB
 		device pci 1f.2 off end # Power Management Controller
 		device pci 1f.3 on  end # Intel HDA
 		device pci 1f.4 on  end # SMBus
-		device pci 1f.5 on  end # PCH SPI
+		device pci 1f.5 on  end	# PCH SPI
 		device pci 1f.6 off end # GbE
 	end
 end
diff --git a/src/mainboard/system76/lemp9/gpio.h b/src/mainboard/system76/lemp9/gpio.h
index d06145d1a9..8e86647d52 100644
--- a/src/mainboard/system76/lemp9/gpio.h
+++ b/src/mainboard/system76/lemp9/gpio.h
@@ -76,8 +76,8 @@ static const struct pad_config gpio_table[] = {
 		PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1),
 
 	// GSPI0
-		// TODO - TPM_PIRQ#
-		PAD_CFG_NC(GPP_A7),
+		// PIRQA# / TPM_PIRQ#
+		PAD_CFG_NF(GPP_A7, NONE, DEEP, NF1),
 
 	// LPC
 		// PM_CLKRUN# with pull-up