On Fri, 2021-09-24 at 15:41 +0100, Mark Brown wrote:
> In commit c46ed2281bbe ("tpm_tis_spi: add missing SPI device ID entries")
> we added SPI IDs for all the DT aliases to handle the fact that we always
> use SPI modaliases to load modules even when probed via DT however the
> mentioned commit missed that the SPI and OF device ID entries did not
> match and were different and so DT nodes with compatible
> "tcg,tpm_tis-spi" will not match. Add an extra ID for tpm_tis-spi
> rather than just fix the existing one since what's currently there is
> going to be better for anyone actually using SPI IDs to instantiate.
>
> Fixes: c46ed2281bbe ("tpm_tis_spi: add missing SPI device ID entries")
> Fixes: 96c8395e2166 ("spi: Revert modalias changes")
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
> Reviewed-by: Javier Martinez Canillas <javierm@xxxxxxxxxx>
> ---
>
> v2:
> - Tweak commit message with suggestion from Javier.
>
> drivers/char/tpm/tpm_tis_spi_main.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c
> index 54584b4b00d1..aaa59a00eeae 100644
> --- a/drivers/char/tpm/tpm_tis_spi_main.c
> +++ b/drivers/char/tpm/tpm_tis_spi_main.c
> @@ -267,6 +267,7 @@ static const struct spi_device_id tpm_tis_spi_id[] = {
> { "st33htpm-spi", (unsigned long)tpm_tis_spi_probe },
> { "slb9670", (unsigned long)tpm_tis_spi_probe },
> { "tpm_tis_spi", (unsigned long)tpm_tis_spi_probe },
> + { "tpm_tis-spi", (unsigned long)tpm_tis_spi_probe },
> { "cr50", (unsigned long)cr50_spi_probe },
> {}
> };
I replaced the previous patch with this in my GIT tree.
/Jarkko
