Den lør. 13. jan. 2024 kl. 10.03 skrev Lukas Wunner <lukas@xxxxxxxxx>:
>
> Since commit 26c9d152ebf3 ("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/ZZTS0p1hdAchIbKp@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/
>
> Aspeed Tacoma uses a Nuvoton NPCT75X per commit 39d8a73c53a2 ("ARM: dts:
> aspeed: tacoma: Add TPM").
>
> phyGATE-Tauri uses an Infineon SLB9670:
> https://lore.kernel.org/all/ab45c82485fa272f74adf560cbb58ee60cc42689.camel@xxxxxxxxx/
>
> 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/20231220090910.GA32182@xxxxxxxxx/
>
> Signed-off-by: Lukas Wunner <lukas@xxxxxxxxx>
> Reviewed-by: Patrick Williams <patrick@xxxxxxxxx>
> Reviewed-by: Tao Ren <rentao.bupt@xxxxxxxxx>
Change in imx7d-flex-concentrator.dts looks good to me.
Reviewed-by: Bruno Thomsen <bruno.thomsen@xxxxxxxxx>
> ---
> The commit mentioned above, 26c9d152ebf3 ("dt-bindings: tpm: Consolidate
> TCG TIS bindings") landed in Linus' tree 8 hours ago.
>
> Because this consists only of fixes, I think it could be picked up and
> forwarded to Linus at any time, even outside the merge window.
>
> The Reviewed-by tags from Patrick and Tao were offered here:
> https://lore.kernel.org/all/ZZWB4wRiAyDtlLJM@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/
> https://lore.kernel.org/all/ZZWkhaiDFOGvcPQy@fedora/
>
> arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 4 ++--
> arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts | 4 ++--
> arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts | 2 +-
> arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi | 4 ++--
> arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi | 2 +-
> arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator.dts | 2 +-
> arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2100-common.dtsi | 2 +-
> 7 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts
> index e899de6..5be0e8f 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts
> @@ -45,8 +45,8 @@
> num-chipselects = <1>;
> cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
>
> - tpmdev@0 {
> - compatible = "tcg,tpm_tis-spi";
> + tpm@0 {
> + compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
> spi-max-frequency = <33000000>;
> reg = <0>;
> };
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
> index a677c82..5a8169b 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
> @@ -80,8 +80,8 @@
> gpio-miso = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_HIGH>;
> num-chipselects = <1>;
>
> - tpmdev@0 {
> - compatible = "tcg,tpm_tis-spi";
> + tpm@0 {
> + compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
> spi-max-frequency = <33000000>;
> reg = <0>;
> };
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
> index 3f6010e..213023b 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
> @@ -456,7 +456,7 @@
> status = "okay";
>
> tpm: tpm@2e {
> - compatible = "tcg,tpm-tis-i2c";
> + compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
> reg = <0x2e>;
> };
> };
> diff --git a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
> index 31590d3..00e5887 100644
> --- a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
> +++ b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
> @@ -35,8 +35,8 @@
> gpio-mosi = <&gpio0 ASPEED_GPIO(X, 4) GPIO_ACTIVE_HIGH>;
> gpio-miso = <&gpio0 ASPEED_GPIO(X, 5) GPIO_ACTIVE_HIGH>;
>
> - tpmdev@0 {
> - compatible = "tcg,tpm_tis-spi";
> + tpm@0 {
> + compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
> spi-max-frequency = <33000000>;
> reg = <0>;
> };
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi
> index 44cc4ff..d12fb44 100644
> --- a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi
> +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi
> @@ -116,7 +116,7 @@
> tpm_tis: tpm@1 {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_tpm>;
> - compatible = "tcg,tpm_tis-spi";
> + compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
> reg = <1>;
> spi-max-frequency = <20000000>;
> interrupt-parent = <&gpio5>;
> diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator.dts b/arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator.dts
> index 3a72384..9984b34 100644
> --- a/arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator.dts
> +++ b/arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator.dts
> @@ -130,7 +130,7 @@
> * TCG specification - Section 6.4.1 Clocking:
> * TPM shall support a SPI clock frequency range of 10-24 MHz.
> */
> - st33htph: tpm-tis@0 {
> + st33htph: tpm@0 {
> compatible = "st,st33htpm-spi", "tcg,tpm_tis-spi";
> reg = <0>;
> spi-max-frequency = <24000000>;
> diff --git a/arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2100-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2100-common.dtsi
> index b8730aa..a59331a 100644
> --- a/arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2100-common.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2100-common.dtsi
> @@ -217,7 +217,7 @@
> pinctrl-names = "default";
> pinctrl-0 = <&spi1_pins>;
>
> - tpm_spi_tis@0 {
> + tpm@0 {
> compatible = "tcg,tpm_tis-spi";
> reg = <0>;
> spi-max-frequency = <500000>;
> --
> 2.40.1
>
