2024-01-03 09:02:29

by Michal Simek

Subject: [PATCH] dt-bindings: security: tpm: Convert TPM tis spi to yaml

Convert binding from txt to yaml. Enforce that node name starts with tpm@
which should be generic enough for these devices.
Deprecating tcg,tpm_tis-spi because it is using "_" which shouldn't be used
by in compatible string that's why infineon compatible string is used for
file name too.
Also add current TPM maintainers and maintainers of this dt binding too.

Signed-off-by: Michal Simek <[email protected]>
---

I want to do just conversion but not really take care about this device.
---
.../security/tpm/infineon,slb9670.yaml | 54 +++++++++++++++++++
.../bindings/security/tpm/tpm_tis_spi.txt | 23 --------
2 files changed, 54 insertions(+), 23 deletions(-)
create mode 100644 Documentation/devicetree/bindings/security/tpm/infineon,slb9670.yaml
delete mode 100644 Documentation/devicetree/bindings/security/tpm/tpm_tis_spi.txt

diff --git a/Documentation/devicetree/bindings/security/tpm/infineon,slb9670.yaml b/Documentation/devicetree/bindings/security/tpm/infineon,slb9670.yaml
new file mode 100644
index 000000000000..309b91881774
--- /dev/null
+++ b/Documentation/devicetree/bindings/security/tpm/infineon,slb9670.yaml
@@ -0,0 +1,54 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/security/tpm/infineon,slb9670.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Trusted Platform Module (TPM) with a SPI interface
+
+maintainers:
+ - Peter Huewe <[email protected]>
+ - Jarkko Sakkinen <[email protected]>
+
+properties:
+ $nodename:
+ pattern: "^tpm@[0-9a-f]{1,2}$"
+
+ compatible:
+ oneOf:
+ - enum:
+ - st,st33htpm-spi
+ - infineon,slb9670
+ - google,cr50
+ - const: tcg,tpm_tis-spi
+ deprecated: true
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - spi-max-frequency
+
+allOf:
+ - $ref: /schemas/spi/spi-peripheral-props.yaml#
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ spi {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ tpm@1 {
+ compatible = "infineon,slb9670";
+ reg = <0x1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_tpm>;
+ spi-max-frequency = <20000000>;
+ };
+ };
diff --git a/Documentation/devicetree/bindings/security/tpm/tpm_tis_spi.txt b/Documentation/devicetree/bindings/security/tpm/tpm_tis_spi.txt
deleted file mode 100644
index b800667da92b..000000000000
--- a/Documentation/devicetree/bindings/security/tpm/tpm_tis_spi.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Required properties:
-- compatible: should be one of the following
- "st,st33htpm-spi"
- "infineon,slb9670"
- "tcg,tpm_tis-spi"
-- spi-max-frequency: Maximum SPI frequency (depends on TPMs).
-
-Optional SoC Specific Properties:
-- pinctrl-names: Contains only one value - "default".
-- pintctrl-0: Specifies the pin control groups used for this controller.
-
-Example (for ARM-based BeagleBoard xM with TPM_TIS on SPI4):
-
-&mcspi4 {
-
-
- tpm_tis@0 {
-
- compatible = "tcg,tpm_tis-spi";
-
- spi-max-frequency = <10000000>;
- };
-};
--
2.36.1

2024-01-04 07:56:07

by Krzysztof Kozlowski

Subject: Re: [PATCH] dt-bindings: security: tpm: Convert TPM tis spi to yaml

On 03/01/2024 10:01, Michal Simek wrote:
> Convert binding from txt to yaml. Enforce that node name starts with tpm@
> which should be generic enough for these devices.
> Deprecating tcg,tpm_tis-spi because it is using "_" which shouldn't be used
> by in compatible string that's why infineon compatible string is used for
> file name too.
> Also add current TPM maintainers and maintainers of this dt binding too.
>
> Signed-off-by: Michal Simek <[email protected]>

https://lore.kernel.org/all/953fd4c7519030db88e5b5e12ab6307414ebdd21.1702806810.git.lukas@wunner.de/

Best regards,
Krzysztof

2024-01-04 12:11:01

by Michal Simek

Subject: Re: [PATCH] dt-bindings: security: tpm: Convert TPM tis spi to yaml

On 1/4/24 08:55, Krzysztof Kozlowski wrote:
> On 03/01/2024 10:01, Michal Simek wrote:
>> Convert binding from txt to yaml. Enforce that node name starts with tpm@
>> which should be generic enough for these devices.
>> Deprecating tcg,tpm_tis-spi because it is using "_" which shouldn't be used
>> by in compatible string that's why infineon compatible string is used for
>> file name too.
>> Also add current TPM maintainers and maintainers of this dt binding too.
>>
>> Signed-off-by: Michal Simek <[email protected]>
>
> https://lore.kernel.org/all/953fd4c7519030db88e5b5e12ab6307414ebdd21.1702806810.git.lukas@wunner.de/

g8. Works for me. Please ignore this patch.

Thanks,
Michal