Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/27786 )
Change subject: mb/google,samsung/*: Add LPC TPM chip driver to devicetree ......................................................................
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 --- M src/mainboard/google/beltino/devicetree.cb M src/mainboard/google/butterfly/devicetree.cb M src/mainboard/google/jecht/devicetree.cb M src/mainboard/google/link/devicetree.cb M src/mainboard/google/rambi/variants/banjo/devicetree.cb M src/mainboard/google/rambi/variants/candy/devicetree.cb M src/mainboard/google/rambi/variants/clapper/devicetree.cb M src/mainboard/google/rambi/variants/enguarde/devicetree.cb M src/mainboard/google/rambi/variants/glimmer/devicetree.cb M src/mainboard/google/rambi/variants/gnawty/devicetree.cb M src/mainboard/google/rambi/variants/heli/devicetree.cb M src/mainboard/google/rambi/variants/kip/devicetree.cb M src/mainboard/google/rambi/variants/ninja/devicetree.cb M src/mainboard/google/rambi/variants/orco/devicetree.cb M src/mainboard/google/rambi/variants/quawks/devicetree.cb M src/mainboard/google/rambi/variants/rambi/devicetree.cb M src/mainboard/google/rambi/variants/squawks/devicetree.cb M src/mainboard/google/rambi/variants/sumo/devicetree.cb M src/mainboard/google/rambi/variants/swanky/devicetree.cb M src/mainboard/google/rambi/variants/winky/devicetree.cb M src/mainboard/google/slippy/variants/falco/devicetree.cb M src/mainboard/google/slippy/variants/leon/devicetree.cb M src/mainboard/google/slippy/variants/peppy/devicetree.cb M src/mainboard/google/slippy/variants/wolf/devicetree.cb M src/mainboard/google/stout/devicetree.cb M src/mainboard/samsung/lumpy/devicetree.cb M src/mainboard/samsung/stumpy/devicetree.cb 27 files changed, 81 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Philipp Deppenwiese: Looks good to me, approved Arthur Heymans: Looks good to me, approved
diff --git a/src/mainboard/google/beltino/devicetree.cb b/src/mainboard/google/beltino/devicetree.cb index 90409cd..89758dd 100644 --- a/src/mainboard/google/beltino/devicetree.cb +++ b/src/mainboard/google/beltino/devicetree.cb @@ -96,6 +96,9 @@ device pci 1d.0 on end # USB2 EHCI device pci 1e.0 off end # PCI bridge device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip superio/ite/it8772f # Skip keyboard init register "skip_keyboard" = "1" diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb index 9b44fe8..692414c 100644 --- a/src/mainboard/google/butterfly/devicetree.cb +++ b/src/mainboard/google/butterfly/devicetree.cb @@ -87,6 +87,9 @@ device pci 1d.0 on end # USB2 EHCI #1 device pci 1e.0 off end # PCI bridge device pci 1f.0 on #LPC bridge + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/quanta/ene_kb3940q # 60/64 KBC device pnp ff.1 on # dummy address diff --git a/src/mainboard/google/jecht/devicetree.cb b/src/mainboard/google/jecht/devicetree.cb index 8a2129f..d34bf7a 100644 --- a/src/mainboard/google/jecht/devicetree.cb +++ b/src/mainboard/google/jecht/devicetree.cb @@ -76,6 +76,9 @@ device pci 1d.0 on end # USB2 EHCI device pci 1e.0 off end # PCI bridge device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip superio/ite/it8772f # Skip keyboard init register "skip_keyboard" = "1" diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb index 437b3cb..07be8e7 100644 --- a/src/mainboard/google/link/devicetree.cb +++ b/src/mainboard/google/link/devicetree.cb @@ -86,6 +86,9 @@ device pci 1d.0 on end # USB2 EHCI #1 device pci 1e.0 off end # PCI bridge device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/banjo/devicetree.cb b/src/mainboard/google/rambi/variants/banjo/devicetree.cb index e380920..acfb271 100644 --- a/src/mainboard/google/rambi/variants/banjo/devicetree.cb +++ b/src/mainboard/google/rambi/variants/banjo/devicetree.cb @@ -88,6 +88,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/candy/devicetree.cb b/src/mainboard/google/rambi/variants/candy/devicetree.cb index 5cbb974..e4a39e9 100644 --- a/src/mainboard/google/rambi/variants/candy/devicetree.cb +++ b/src/mainboard/google/rambi/variants/candy/devicetree.cb @@ -89,6 +89,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/clapper/devicetree.cb b/src/mainboard/google/rambi/variants/clapper/devicetree.cb index 13902b0..497a0b1 100644 --- a/src/mainboard/google/rambi/variants/clapper/devicetree.cb +++ b/src/mainboard/google/rambi/variants/clapper/devicetree.cb @@ -76,6 +76,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/enguarde/devicetree.cb b/src/mainboard/google/rambi/variants/enguarde/devicetree.cb index 89929b0..3b00bb7 100644 --- a/src/mainboard/google/rambi/variants/enguarde/devicetree.cb +++ b/src/mainboard/google/rambi/variants/enguarde/devicetree.cb @@ -88,6 +88,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/glimmer/devicetree.cb b/src/mainboard/google/rambi/variants/glimmer/devicetree.cb index 5148225..db26366 100644 --- a/src/mainboard/google/rambi/variants/glimmer/devicetree.cb +++ b/src/mainboard/google/rambi/variants/glimmer/devicetree.cb @@ -85,6 +85,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/gnawty/devicetree.cb b/src/mainboard/google/rambi/variants/gnawty/devicetree.cb index 0024679..30320cc 100644 --- a/src/mainboard/google/rambi/variants/gnawty/devicetree.cb +++ b/src/mainboard/google/rambi/variants/gnawty/devicetree.cb @@ -88,6 +88,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/heli/devicetree.cb b/src/mainboard/google/rambi/variants/heli/devicetree.cb index 8b3c83f..c3ec601 100644 --- a/src/mainboard/google/rambi/variants/heli/devicetree.cb +++ b/src/mainboard/google/rambi/variants/heli/devicetree.cb @@ -89,6 +89,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/kip/devicetree.cb b/src/mainboard/google/rambi/variants/kip/devicetree.cb index d1d6beb..5bb99f0 100644 --- a/src/mainboard/google/rambi/variants/kip/devicetree.cb +++ b/src/mainboard/google/rambi/variants/kip/devicetree.cb @@ -88,6 +88,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/ninja/devicetree.cb b/src/mainboard/google/rambi/variants/ninja/devicetree.cb index 5c9595c..c983681 100644 --- a/src/mainboard/google/rambi/variants/ninja/devicetree.cb +++ b/src/mainboard/google/rambi/variants/ninja/devicetree.cb @@ -89,6 +89,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/orco/devicetree.cb b/src/mainboard/google/rambi/variants/orco/devicetree.cb index 8291794..63b6097 100644 --- a/src/mainboard/google/rambi/variants/orco/devicetree.cb +++ b/src/mainboard/google/rambi/variants/orco/devicetree.cb @@ -88,6 +88,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/quawks/devicetree.cb b/src/mainboard/google/rambi/variants/quawks/devicetree.cb index 320b59b..0e1f789 100644 --- a/src/mainboard/google/rambi/variants/quawks/devicetree.cb +++ b/src/mainboard/google/rambi/variants/quawks/devicetree.cb @@ -85,6 +85,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/rambi/devicetree.cb b/src/mainboard/google/rambi/variants/rambi/devicetree.cb index ddd1914..a24bd33 100644 --- a/src/mainboard/google/rambi/variants/rambi/devicetree.cb +++ b/src/mainboard/google/rambi/variants/rambi/devicetree.cb @@ -89,6 +89,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/squawks/devicetree.cb b/src/mainboard/google/rambi/variants/squawks/devicetree.cb index 46f2385..ae4bfe5 100644 --- a/src/mainboard/google/rambi/variants/squawks/devicetree.cb +++ b/src/mainboard/google/rambi/variants/squawks/devicetree.cb @@ -85,6 +85,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/sumo/devicetree.cb b/src/mainboard/google/rambi/variants/sumo/devicetree.cb index 89e2f2b..f354815 100644 --- a/src/mainboard/google/rambi/variants/sumo/devicetree.cb +++ b/src/mainboard/google/rambi/variants/sumo/devicetree.cb @@ -89,6 +89,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/swanky/devicetree.cb b/src/mainboard/google/rambi/variants/swanky/devicetree.cb index db21bd6..d591e3f 100644 --- a/src/mainboard/google/rambi/variants/swanky/devicetree.cb +++ b/src/mainboard/google/rambi/variants/swanky/devicetree.cb @@ -88,6 +88,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/rambi/variants/winky/devicetree.cb b/src/mainboard/google/rambi/variants/winky/devicetree.cb index 6d52b89..9c25d1e 100644 --- a/src/mainboard/google/rambi/variants/winky/devicetree.cb +++ b/src/mainboard/google/rambi/variants/winky/devicetree.cb @@ -89,6 +89,9 @@ device pci 1e.4 off end # HSUART2 device pci 1e.5 off end # SPI device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/slippy/variants/falco/devicetree.cb b/src/mainboard/google/slippy/variants/falco/devicetree.cb index cdf47cf..f2a9520 100644 --- a/src/mainboard/google/slippy/variants/falco/devicetree.cb +++ b/src/mainboard/google/slippy/variants/falco/devicetree.cb @@ -109,6 +109,9 @@ device pci 1d.0 on end # USB2 EHCI device pci 1e.0 off end # PCI bridge device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/slippy/variants/leon/devicetree.cb b/src/mainboard/google/slippy/variants/leon/devicetree.cb index b0edb7f..8951e99 100644 --- a/src/mainboard/google/slippy/variants/leon/devicetree.cb +++ b/src/mainboard/google/slippy/variants/leon/devicetree.cb @@ -114,6 +114,9 @@ device pci 1d.0 on end # USB2 EHCI device pci 1e.0 off end # PCI bridge device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/slippy/variants/peppy/devicetree.cb b/src/mainboard/google/slippy/variants/peppy/devicetree.cb index e9875a6..6451d95 100644 --- a/src/mainboard/google/slippy/variants/peppy/devicetree.cb +++ b/src/mainboard/google/slippy/variants/peppy/devicetree.cb @@ -113,6 +113,9 @@ device pci 1d.0 on end # USB2 EHCI device pci 1e.0 off end # PCI bridge device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/slippy/variants/wolf/devicetree.cb b/src/mainboard/google/slippy/variants/wolf/devicetree.cb index 7655c41..2cad23b 100644 --- a/src/mainboard/google/slippy/variants/wolf/devicetree.cb +++ b/src/mainboard/google/slippy/variants/wolf/devicetree.cb @@ -114,6 +114,9 @@ device pci 1d.0 on end # USB2 EHCI device pci 1e.0 off end # PCI bridge device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/google/chromeec # We only have one init function that # we need to call to initialize the diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb index 76f2856..0fdb55e 100644 --- a/src/mainboard/google/stout/devicetree.cb +++ b/src/mainboard/google/stout/devicetree.cb @@ -97,6 +97,9 @@ device pci 1d.0 on end # USB2 EHCI #1 (Camera, WLAN, WWAN) device pci 1e.0 off end # PCI bridge device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end chip ec/quanta/it8518 # 60h/64h KBC device pnp ff.1 on # dummy address diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb index 0dd3228..0362b2c 100644 --- a/src/mainboard/samsung/lumpy/devicetree.cb +++ b/src/mainboard/samsung/lumpy/devicetree.cb @@ -119,6 +119,9 @@ register "base" = "(void *)0xfec00000" device ioapic 4 on end end + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end end device pci 1f.2 on # SATA Controller 1 ioapic_irq 4 INTA 0x10 diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb index adc15e6..825dfa0 100644 --- a/src/mainboard/samsung/stumpy/devicetree.cb +++ b/src/mainboard/samsung/stumpy/devicetree.cb @@ -116,6 +116,9 @@ end # Mouse device pnp 2e.a off end # IR end + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end end device pci 1f.2 on end # SATA Controller 1 device pci 1f.3 on end # SMBus
-
Philipp Deppenwiese (Code Review)