Skip to content

Commit 5e2400f

Browse files
l1karndb
authored andcommitted
arm64: dts: Fix TPM schema violations
Since commit 26c9d15 ("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/[email protected]/ Gateworks Venice uses an Atmel ATTPM20P: https://trac.gateworks.com/wiki/tpm Signed-off-by: Lukas Wunner <[email protected]> Acked-by: Heiko Stuebner <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
1 parent 8412c47 commit 5e2400f

12 files changed

+12
-12
lines changed

arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
};
121121

122122
tpm: tpm@1 {
123-
compatible = "tcg,tpm_tis-spi";
123+
compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
124124
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
125125
interrupt-parent = <&gpio2>;
126126
pinctrl-names = "default";

arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
status = "okay";
9090

9191
tpm@1 {
92-
compatible = "tcg,tpm_tis-spi";
92+
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
9393
reg = <0x1>;
9494
spi-max-frequency = <36000000>;
9595
};

arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
status = "okay";
110110

111111
tpm@1 {
112-
compatible = "tcg,tpm_tis-spi";
112+
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
113113
reg = <0x1>;
114114
spi-max-frequency = <36000000>;
115115
};

arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
status = "okay";
235235

236236
tpm: tpm@0 {
237-
compatible = "infineon,slb9670";
237+
compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
238238
reg = <0>;
239239
pinctrl-names = "default";
240240
pinctrl-0 = <&pinctrl_tpm>;

arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
status = "okay";
104104

105105
tpm@1 {
106-
compatible = "tcg,tpm_tis-spi";
106+
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
107107
reg = <0x1>;
108108
spi-max-frequency = <36000000>;
109109
};

arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
status = "okay";
116116

117117
tpm@1 {
118-
compatible = "tcg,tpm_tis-spi";
118+
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
119119
reg = <0x1>;
120120
spi-max-frequency = <36000000>;
121121
};

arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
status = "okay";
197197

198198
tpm@0 {
199-
compatible = "tcg,tpm_tis-spi";
199+
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
200200
reg = <0x0>;
201201
spi-max-frequency = <36000000>;
202202
};

arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
status = "okay";
6666

6767
tpm@0 {
68-
compatible = "infineon,slb9670";
68+
compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
6969
reg = <0>;
7070
spi-max-frequency = <43000000>;
7171
};

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@
888888
status = "okay";
889889
cs-gpios = <&pio 86 GPIO_ACTIVE_LOW>;
890890

891-
cr50@0 {
891+
tpm@0 {
892892
compatible = "google,cr50";
893893
reg = <0>;
894894
spi-max-frequency = <1000000>;

arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@
14021402
pinctrl-names = "default";
14031403
pinctrl-0 = <&spi5_pins>;
14041404

1405-
cr50@0 {
1405+
tpm@0 {
14061406
compatible = "google,cr50";
14071407
reg = <0>;
14081408
interrupts-extended = <&pio 171 IRQ_TYPE_EDGE_RISING>;

0 commit comments

Comments
 (0)