Commit 5e2400f1 authored by Lukas Wunner's avatar Lukas Wunner Committed by Arnd Bergmann

arm64: dts: Fix TPM schema violations

Since commit 26c9d152 ("dt-bindings: tpm: Consolidate TCG TIS
bindings"), several issues are reported by "make dtbs_check" for arm64
devicetrees:

The compatible property needs to contain the chip's name in addition to
the generic "tcg,tpm_tis-spi" and the nodename needs to be "tpm@0"
rather than "cr50@0":

  tpm@1: compatible: ['tcg,tpm_tis-spi'] is too short
        from schema $id: http://devicetree.org/schemas/tpm/tcg,tpm_tis-spi.yaml#

  cr50@0: $nodename:0: 'cr50@0' does not match '^tpm(@[0-9a-f]+)?$'
        from schema $id: http://devicetree.org/schemas/tpm/google,cr50.yaml#

Fix these schema violations.

phyGATE-Tauri uses an Infineon SLB9670:
https://lore.kernel.org/all/ab45c82485fa272f74adf560cbb58ee60cc42689.camel@phytec.de/

Gateworks Venice uses an Atmel ATTPM20P:
https://trac.gateworks.com/wiki/tpmSigned-off-by: default avatarLukas Wunner <lukas@wunner.de>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
parent 8412c47d
...@@ -120,7 +120,7 @@ can0: can@0 { ...@@ -120,7 +120,7 @@ can0: can@0 {
}; };
tpm: tpm@1 { tpm: tpm@1 {
compatible = "tcg,tpm_tis-spi"; compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
interrupts = <11 IRQ_TYPE_LEVEL_LOW>; interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -89,7 +89,7 @@ &ecspi2 { ...@@ -89,7 +89,7 @@ &ecspi2 {
status = "okay"; status = "okay";
tpm@1 { tpm@1 {
compatible = "tcg,tpm_tis-spi"; compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
reg = <0x1>; reg = <0x1>;
spi-max-frequency = <36000000>; spi-max-frequency = <36000000>;
}; };
......
...@@ -109,7 +109,7 @@ &ecspi2 { ...@@ -109,7 +109,7 @@ &ecspi2 {
status = "okay"; status = "okay";
tpm@1 { tpm@1 {
compatible = "tcg,tpm_tis-spi"; compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
reg = <0x1>; reg = <0x1>;
spi-max-frequency = <36000000>; spi-max-frequency = <36000000>;
}; };
......
...@@ -234,7 +234,7 @@ &ecspi2 { ...@@ -234,7 +234,7 @@ &ecspi2 {
status = "okay"; status = "okay";
tpm: tpm@0 { tpm: tpm@0 {
compatible = "infineon,slb9670"; compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
reg = <0>; reg = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_tpm>; pinctrl-0 = <&pinctrl_tpm>;
......
...@@ -103,7 +103,7 @@ &ecspi2 { ...@@ -103,7 +103,7 @@ &ecspi2 {
status = "okay"; status = "okay";
tpm@1 { tpm@1 {
compatible = "tcg,tpm_tis-spi"; compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
reg = <0x1>; reg = <0x1>;
spi-max-frequency = <36000000>; spi-max-frequency = <36000000>;
}; };
......
...@@ -115,7 +115,7 @@ &ecspi2 { ...@@ -115,7 +115,7 @@ &ecspi2 {
status = "okay"; status = "okay";
tpm@1 { tpm@1 {
compatible = "tcg,tpm_tis-spi"; compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
reg = <0x1>; reg = <0x1>;
spi-max-frequency = <36000000>; spi-max-frequency = <36000000>;
}; };
......
...@@ -196,7 +196,7 @@ &ecspi1 { ...@@ -196,7 +196,7 @@ &ecspi1 {
status = "okay"; status = "okay";
tpm@0 { tpm@0 {
compatible = "tcg,tpm_tis-spi"; compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
reg = <0x0>; reg = <0x0>;
spi-max-frequency = <36000000>; spi-max-frequency = <36000000>;
}; };
......
...@@ -65,7 +65,7 @@ &ecspi2 { ...@@ -65,7 +65,7 @@ &ecspi2 {
status = "okay"; status = "okay";
tpm@0 { tpm@0 {
compatible = "infineon,slb9670"; compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
reg = <0>; reg = <0>;
spi-max-frequency = <43000000>; spi-max-frequency = <43000000>;
}; };
......
...@@ -888,7 +888,7 @@ &spi0 { ...@@ -888,7 +888,7 @@ &spi0 {
status = "okay"; status = "okay";
cs-gpios = <&pio 86 GPIO_ACTIVE_LOW>; cs-gpios = <&pio 86 GPIO_ACTIVE_LOW>;
cr50@0 { tpm@0 {
compatible = "google,cr50"; compatible = "google,cr50";
reg = <0>; reg = <0>;
spi-max-frequency = <1000000>; spi-max-frequency = <1000000>;
......
...@@ -1402,7 +1402,7 @@ &spi5 { ...@@ -1402,7 +1402,7 @@ &spi5 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi5_pins>; pinctrl-0 = <&spi5_pins>;
cr50@0 { tpm@0 {
compatible = "google,cr50"; compatible = "google,cr50";
reg = <0>; reg = <0>;
interrupts-extended = <&pio 171 IRQ_TYPE_EDGE_RISING>; interrupts-extended = <&pio 171 IRQ_TYPE_EDGE_RISING>;
......
...@@ -70,7 +70,7 @@ &cpu_alert1 { ...@@ -70,7 +70,7 @@ &cpu_alert1 {
&spi0 { &spi0 {
status = "okay"; status = "okay";
cr50@0 { tpm@0 {
compatible = "google,cr50"; compatible = "google,cr50";
reg = <0>; reg = <0>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
......
...@@ -706,7 +706,7 @@ &sound { ...@@ -706,7 +706,7 @@ &sound {
&spi2 { &spi2 {
status = "okay"; status = "okay";
cr50@0 { tpm@0 {
compatible = "google,cr50"; compatible = "google,cr50";
reg = <0>; reg = <0>;
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment