Skip to content

Commit 8412c47

Browse files
l1karndb
authored andcommitted
ARM: dts: Fix TPM schema violations
Since commit 26c9d15 ("dt-bindings: tpm: Consolidate TCG TIS bindings"), several issues are reported by "make dtbs_check" for ARM devicetrees: The nodename needs to be "tpm@0" rather than "tpmdev@0" and the compatible property needs to contain the chip's name in addition to the generic "tcg,tpm_tis-spi" or "tcg,tpm-tis-i2c": tpmdev@0: $nodename:0: 'tpmdev@0' does not match '^tpm(@[0-9a-f]+)?$' from schema $id: http://devicetree.org/schemas/tpm/tcg,tpm_tis-spi.yaml# tpm@2e: compatible: 'oneOf' conditional failed, one must be fixed: ['tcg,tpm-tis-i2c'] is too short from schema $id: http://devicetree.org/schemas/tpm/tcg,tpm-tis-i2c.yaml# Fix these schema violations. Aspeed Facebook BMCs use an Infineon SLB9670: https://lore.kernel.org/all/ZZSmMJ%2F%2Fl972Qbxu@fedora/ https://lore.kernel.org/all/ZZT4%2Fw2eVzMhtsPx@fedora/ https://lore.kernel.org/all/[email protected]/ Aspeed Tacoma uses a Nuvoton NPCT75X per commit 39d8a73 ("ARM: dts: aspeed: tacoma: Add TPM"). phyGATE-Tauri uses an Infineon SLB9670: https://lore.kernel.org/all/[email protected]/ A single schema violation remains in am335x-moxa-uc-2100-common.dtsi because it is unknown which chip is used on the board. The devicetree's author has been asked for clarification but has not responded so far: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Lukas Wunner <[email protected]> Reviewed-by: Patrick Williams <[email protected]> Reviewed-by: Tao Ren <[email protected]> Reviewed-by: Bruno Thomsen <[email protected]>
1 parent 6613476 commit 8412c47

7 files changed

+10
-10
lines changed

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
num-chipselects = <1>;
4646
cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
4747

48-
tpmdev@0 {
49-
compatible = "tcg,tpm_tis-spi";
48+
tpm@0 {
49+
compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
5050
spi-max-frequency = <33000000>;
5151
reg = <0>;
5252
};

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
gpio-miso = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_HIGH>;
8181
num-chipselects = <1>;
8282

83-
tpmdev@0 {
84-
compatible = "tcg,tpm_tis-spi";
83+
tpm@0 {
84+
compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
8585
spi-max-frequency = <33000000>;
8686
reg = <0>;
8787
};

arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
status = "okay";
457457

458458
tpm: tpm@2e {
459-
compatible = "tcg,tpm-tis-i2c";
459+
compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
460460
reg = <0x2e>;
461461
};
462462
};

arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
gpio-mosi = <&gpio0 ASPEED_GPIO(X, 4) GPIO_ACTIVE_HIGH>;
3636
gpio-miso = <&gpio0 ASPEED_GPIO(X, 5) GPIO_ACTIVE_HIGH>;
3737

38-
tpmdev@0 {
39-
compatible = "tcg,tpm_tis-spi";
38+
tpm@0 {
39+
compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
4040
spi-max-frequency = <33000000>;
4141
reg = <0>;
4242
};

arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
tpm_tis: tpm@1 {
117117
pinctrl-names = "default";
118118
pinctrl-0 = <&pinctrl_tpm>;
119-
compatible = "tcg,tpm_tis-spi";
119+
compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
120120
reg = <1>;
121121
spi-max-frequency = <20000000>;
122122
interrupt-parent = <&gpio5>;

arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
* TCG specification - Section 6.4.1 Clocking:
131131
* TPM shall support a SPI clock frequency range of 10-24 MHz.
132132
*/
133-
st33htph: tpm-tis@0 {
133+
st33htph: tpm@0 {
134134
compatible = "st,st33htpm-spi", "tcg,tpm_tis-spi";
135135
reg = <0>;
136136
spi-max-frequency = <24000000>;

arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2100-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
pinctrl-names = "default";
218218
pinctrl-0 = <&spi1_pins>;
219219

220-
tpm_spi_tis@0 {
220+
tpm@0 {
221221
compatible = "tcg,tpm_tis-spi";
222222
reg = <0>;
223223
spi-max-frequency = <500000>;

0 commit comments

Comments
 (0)