Skip to content

Commit c46ed22

Browse files
martinezjavierjarkkojs
authored andcommitted
tpm_tis_spi: add missing SPI device ID entries
The SPI core always reports a "MODALIAS=spi:<foo>", even if the device was registered via OF. This means that this module won't auto-load if a DT has for example has a node with a compatible "infineon,slb9670" string. In that case kmod will expect a "MODALIAS=of:N*T*Cinfineon,slb9670" uevent but instead will get a "MODALIAS=spi:slb9670", which is not present in the kernel module aliases: $ modinfo drivers/char/tpm/tpm_tis_spi.ko | grep alias alias: of:N*T*Cgoogle,cr50C* alias: of:N*T*Cgoogle,cr50 alias: of:N*T*Ctcg,tpm_tis-spiC* alias: of:N*T*Ctcg,tpm_tis-spi alias: of:N*T*Cinfineon,slb9670C* alias: of:N*T*Cinfineon,slb9670 alias: of:N*T*Cst,st33htpm-spiC* alias: of:N*T*Cst,st33htpm-spi alias: spi:cr50 alias: spi:tpm_tis_spi alias: acpi*:SMO0768:* To workaround this issue, add in the SPI device ID table all the entries that are present in the OF device ID table. Reported-by: Alexander Wellbrock <a.wellbrock@mailbox.org> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Tested-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
1 parent 5317677 commit c46ed22

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/char/tpm/tpm_tis_spi_main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,8 @@ static int tpm_tis_spi_remove(struct spi_device *dev)
264264
}
265265

266266
static const struct spi_device_id tpm_tis_spi_id[] = {
267+
{ "st33htpm-spi", (unsigned long)tpm_tis_spi_probe },
268+
{ "slb9670", (unsigned long)tpm_tis_spi_probe },
267269
{ "tpm_tis_spi", (unsigned long)tpm_tis_spi_probe },
268270
{ "cr50", (unsigned long)cr50_spi_probe },
269271
{}

0 commit comments

Comments
 (0)