[PATCH] tpm2: tis_spi: add linux compatible fallback string

Bruno Thomsen bruno.thomsen at gmail.com
Wed Jun 10 16:50:39 CEST 2020


This solves a compatibility issue with Linux device trees
that contain TPMv2.x hardware. So it's easier to import DTSs
from upstream kernel when migrating board init from C code
to device tree.

The issue is that fallback binding is different between Linux
and u-Boot.

Linux: "tcg,tpm_tis-spi"
U-Boot: "tis,tpm2-spi"

Signed-off-by: Bruno Thomsen <bruno.thomsen at gmail.com>
---
 doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt | 2 +-
 drivers/tpm/tpm2_tis_spi.c                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt b/doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt
index b48a15112d..b0bc9d6a65 100644
--- a/doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt
+++ b/doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt
@@ -2,7 +2,7 @@ ST33TPHF20 SPI TPMv2.0 bindings
 -------------------------------
 
 Required properties:
-- compatible		: Should be "tis,tpm2-spi"
+- compatible		: Should be "tis,tpm2-spi" or "tcg,tpm_tis-spi"
 - reg			: SPI Chip select
 
 Optional properties:
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 36016de4a6..73e5b6aab4 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -679,6 +679,10 @@ static const struct udevice_id tpm_tis_spi_ids[] = {
 		.compatible = "tis,tpm2-spi",
 		.data = (ulong)&tpm_tis_std_chip_data,
 	},
+	{
+		.compatible = "tcg,tpm_tis-spi",
+		.data = (ulong)&tpm_tis_std_chip_data,
+	},
 	{ }
 };
 
-- 
2.26.2



More information about the U-Boot mailing list