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

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/tpm



Signed-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

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ can0: can@0 { 
	};



	tpm: tpm@1 {

		compatible = "tcg,tpm_tis-spi";

		compatible = "infineon,slb9670", "tcg,tpm_tis-spi";

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

		interrupt-parent = <&gpio2>;

		pinctrl-names = "default";

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ &ecspi2 { 
	status = "okay";



	tpm@1 {

		compatible = "tcg,tpm_tis-spi";

		compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";

		reg = <0x1>;

		spi-max-frequency = <36000000>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ &ecspi2 { 
	status = "okay";



	tpm@1 {

		compatible = "tcg,tpm_tis-spi";

		compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";

		reg = <0x1>;

		spi-max-frequency = <36000000>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ &ecspi2 { 
	status = "okay";



	tpm: tpm@0 {

		compatible = "infineon,slb9670";

		compatible = "infineon,slb9670", "tcg,tpm_tis-spi";

		reg = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_tpm>;

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ &ecspi2 { 
	status = "okay";



	tpm@1 {

		compatible = "tcg,tpm_tis-spi";

		compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";

		reg = <0x1>;

		spi-max-frequency = <36000000>;

	};