[PATCH 5/7] dt-bindings: tpm: Document previously undocumented compatibles

[PATCH 5/7] dt-bindings: tpm: Document previously undocumented compatibles

[Alexander Steffen]

Some drivers or device trees are using them already, but documentation was
missing.

Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
---
 .../devicetree/bindings/security/tpm/trivial-tpms.yaml    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Documentation/devicetree/bindings/security/tpm/trivial-tpms.yaml b/Documentation/devicetree/bindings/security/tpm/trivial-tpms.yaml
index 1fd7f38b7b6d..ebaa36f0875e 100644
--- a/Documentation/devicetree/bindings/security/tpm/trivial-tpms.yaml
+++ b/Documentation/devicetree/bindings/security/tpm/trivial-tpms.yaml
@@ -44,6 +44,8 @@ properties:
   compatible:
     contains:
       enum:
+          # Atmel AT97SC3201 LPC TPM 1.1b
+        - atmel,at97sc3201
           # Atmel AT97SC3204 LPC TPM 1.2
         - atmel,at97sc3204
           # Atmel AT97SC3204T I2C TPM 1.2
@@ -58,12 +60,18 @@ properties:
         - infineon,slb9670
           # Infineon SLB9673 I2C TPM 2.0
         - infineon,slb9673
+          # Infineon tpm_i2c_infineon-compatible device (deprecated)
+        - infineon,tpm_i2c_infineon
+          # Microsoft fTPM 2.0
+        - microsoft,ftpm
           # Nuvoton NPCT501 I2C TPM 1.2
         - nuvoton,npct501
           # Nuvoton NPCT601 I2C TPM 2.0
         - nuvoton,npct601
           # Nuvoton NPCT650 I2C TPM 2.0
         - nuvoton,npct650
+          # Nuvoton NPCT75x I2C TPM 2.0
+        - nuvoton,npct75x
           # Socionext SynQuacer MMIO TPM
         - socionext,synquacer-tpm-mmio
           # STMicroelectronics ST33TPHF2xSPI TPM 2.0
-- 
2.25.1

[PATCH 6/7] dt-bindings: tpm: Add fallbacks for all TCG-compliant TPM variants

[Alexander Steffen]

Also, use the same spelling for all of them and mark the one exception as
deprecated.

Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
---
 .../devicetree/bindings/security/tpm/trivial-tpms.yaml        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/security/tpm/trivial-tpms.yaml b/Documentation/devicetree/bindings/security/tpm/trivial-tpms.yaml
index ebaa36f0875e..983c0a7cc6e1 100644
--- a/Documentation/devicetree/bindings/security/tpm/trivial-tpms.yaml
+++ b/Documentation/devicetree/bindings/security/tpm/trivial-tpms.yaml
@@ -76,9 +76,13 @@ properties:
         - socionext,synquacer-tpm-mmio
           # STMicroelectronics ST33TPHF2xSPI TPM 2.0
         - st,st33htpm-spi
+          # TCG TIS-compliant I2C TPM (generic fallback)
+        - tcg,tpm-tis-i2c
           # TCG TIS-compliant MMIO TPM (generic fallback)
         - tcg,tpm-tis-mmio
           # TCG TIS-compliant SPI TPM (generic fallback)
+        - tcg,tpm-tis-spi
+          # TCG TIS-compliant SPI TPM (generic fallback, deprecated)
         - tcg,tpm_tis-spi
           # Winbond WPCT301 I2C TPM 1.2
         - winbond,wpct301
-- 
2.25.1

[PATCH 7/7] tpm: Add missing compatibles to drivers

[Alexander Steffen]

Those have been added to the documentation before, now also add them to
the drivers.

Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
---
 drivers/char/tpm/tpm_tis_i2c.c      | 2 ++
 drivers/char/tpm/tpm_tis_spi_main.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/drivers/char/tpm/tpm_tis_i2c.c b/drivers/char/tpm/tpm_tis_i2c.c
index ba0911b1d1ff..a2ae2eafed6d 100644
--- a/drivers/char/tpm/tpm_tis_i2c.c
+++ b/drivers/char/tpm/tpm_tis_i2c.c
@@ -369,6 +369,8 @@ MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_id);
 #ifdef CONFIG_OF
 static const struct of_device_id of_tis_i2c_match[] = {
 	{ .compatible = "infineon,slb9673", },
+	{ .compatible = "nuvoton,npct75x", },
+	{ .compatible = "tcg,tpm-tis-i2c", },
 	{}
 };
 MODULE_DEVICE_TABLE(of, of_tis_i2c_match);
diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c
index a0963a3e92bd..274c35982a05 100644
--- a/drivers/char/tpm/tpm_tis_spi_main.c
+++ b/drivers/char/tpm/tpm_tis_spi_main.c
@@ -234,6 +234,7 @@ MODULE_DEVICE_TABLE(spi, tpm_tis_spi_id);
 static const struct of_device_id of_tis_spi_match[] = {
 	{ .compatible = "st,st33htpm-spi", .data = tpm_tis_spi_probe },
 	{ .compatible = "infineon,slb9670", .data = tpm_tis_spi_probe },
+	{ .compatible = "tcg,tpm-tis-spi", .data = tpm_tis_spi_probe },
 	{ .compatible = "tcg,tpm_tis-spi", .data = tpm_tis_spi_probe },
 	{ .compatible = "google,cr50", .data = cr50_spi_probe },
 	{}
-- 
2.25.1