mb/google,samsung/*: Add LPC TPM chip driver to devicetree
With commits 9987534 [southbridge/intel: Remove leftover TPM ACPI code]
and 66ce18c
[soc/intel: Remove legacy static TPM asl code] removing
TPM ASL code from the southbridge's LPCB device, the LPC TPM chip driver
(drivers/pc80/tpm) must be added to devicetree in order to ensure the
new acpigen code is used to replace it.
Test: boot various google/samsung boards, verify SSDT created with
LPBC.TPM device and TPM visible to and usable by SeaBIOS and Linux
Change-Id: Iedaa01f26fb357914549bb3dda24b0bd6ef67480
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/27786
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
9fe248fbec
commit
3044af7adc
|
@ -96,6 +96,9 @@ chip northbridge/intel/haswell
|
||||||
device pci 1d.0 on end # USB2 EHCI
|
device pci 1d.0 on end # USB2 EHCI
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip superio/ite/it8772f
|
chip superio/ite/it8772f
|
||||||
# Skip keyboard init
|
# Skip keyboard init
|
||||||
register "skip_keyboard" = "1"
|
register "skip_keyboard" = "1"
|
||||||
|
|
|
@ -87,6 +87,9 @@ chip northbridge/intel/sandybridge
|
||||||
device pci 1d.0 on end # USB2 EHCI #1
|
device pci 1d.0 on end # USB2 EHCI #1
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on #LPC bridge
|
device pci 1f.0 on #LPC bridge
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/quanta/ene_kb3940q
|
chip ec/quanta/ene_kb3940q
|
||||||
# 60/64 KBC
|
# 60/64 KBC
|
||||||
device pnp ff.1 on # dummy address
|
device pnp ff.1 on # dummy address
|
||||||
|
|
|
@ -76,6 +76,9 @@ chip soc/intel/broadwell
|
||||||
device pci 1d.0 on end # USB2 EHCI
|
device pci 1d.0 on end # USB2 EHCI
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip superio/ite/it8772f
|
chip superio/ite/it8772f
|
||||||
# Skip keyboard init
|
# Skip keyboard init
|
||||||
register "skip_keyboard" = "1"
|
register "skip_keyboard" = "1"
|
||||||
|
|
|
@ -86,6 +86,9 @@ chip northbridge/intel/sandybridge
|
||||||
device pci 1d.0 on end # USB2 EHCI #1
|
device pci 1d.0 on end # USB2 EHCI #1
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -88,6 +88,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -89,6 +89,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -76,6 +76,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -88,6 +88,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -85,6 +85,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -88,6 +88,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -89,6 +89,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -88,6 +88,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -89,6 +89,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -88,6 +88,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -85,6 +85,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -89,6 +89,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -85,6 +85,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -89,6 +89,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -88,6 +88,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -89,6 +89,9 @@ chip soc/intel/baytrail
|
||||||
device pci 1e.4 off end # HSUART2
|
device pci 1e.4 off end # HSUART2
|
||||||
device pci 1e.5 off end # SPI
|
device pci 1e.5 off end # SPI
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -109,6 +109,9 @@ chip northbridge/intel/haswell
|
||||||
device pci 1d.0 on end # USB2 EHCI
|
device pci 1d.0 on end # USB2 EHCI
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -114,6 +114,9 @@ chip northbridge/intel/haswell
|
||||||
device pci 1d.0 on end # USB2 EHCI
|
device pci 1d.0 on end # USB2 EHCI
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -113,6 +113,9 @@ chip northbridge/intel/haswell
|
||||||
device pci 1d.0 on end # USB2 EHCI
|
device pci 1d.0 on end # USB2 EHCI
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -114,6 +114,9 @@ chip northbridge/intel/haswell
|
||||||
device pci 1d.0 on end # USB2 EHCI
|
device pci 1d.0 on end # USB2 EHCI
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/google/chromeec
|
chip ec/google/chromeec
|
||||||
# We only have one init function that
|
# We only have one init function that
|
||||||
# we need to call to initialize the
|
# we need to call to initialize the
|
||||||
|
|
|
@ -97,6 +97,9 @@ chip northbridge/intel/sandybridge
|
||||||
device pci 1d.0 on end # USB2 EHCI #1 (Camera, WLAN, WWAN)
|
device pci 1d.0 on end # USB2 EHCI #1 (Camera, WLAN, WWAN)
|
||||||
device pci 1e.0 off end # PCI bridge
|
device pci 1e.0 off end # PCI bridge
|
||||||
device pci 1f.0 on
|
device pci 1f.0 on
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
chip ec/quanta/it8518
|
chip ec/quanta/it8518
|
||||||
# 60h/64h KBC
|
# 60h/64h KBC
|
||||||
device pnp ff.1 on # dummy address
|
device pnp ff.1 on # dummy address
|
||||||
|
|
|
@ -119,6 +119,9 @@ chip northbridge/intel/sandybridge
|
||||||
register "base" = "(void *)0xfec00000"
|
register "base" = "(void *)0xfec00000"
|
||||||
device ioapic 4 on end
|
device ioapic 4 on end
|
||||||
end
|
end
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
device pci 1f.2 on # SATA Controller 1
|
device pci 1f.2 on # SATA Controller 1
|
||||||
ioapic_irq 4 INTA 0x10
|
ioapic_irq 4 INTA 0x10
|
||||||
|
|
|
@ -116,6 +116,9 @@ chip northbridge/intel/sandybridge
|
||||||
end # Mouse
|
end # Mouse
|
||||||
device pnp 2e.a off end # IR
|
device pnp 2e.a off end # IR
|
||||||
end
|
end
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
device pci 1f.2 on end # SATA Controller 1
|
device pci 1f.2 on end # SATA Controller 1
|
||||||
device pci 1f.3 on end # SMBus
|
device pci 1f.3 on end # SMBus
|
||||||
|
|
Loading…
Reference in New Issue