Re: [PATCH v7 4/6] tpm: tpm_tis_spi: Support cr50 devices

Alexander Steffen <Alexander.Steffen@xxxxxxxxxxxx> · Mon, 3 Feb 2020 10:13:29 +0100

On 20.09.2019 20:32, Stephen Boyd wrote:

diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index a01c4cab902a..c96439f11c85 100644
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -21,7 +21,9 @@ tpm-$(CONFIG_EFI) += eventlog/efi.o
  tpm-$(CONFIG_OF) += eventlog/of.o
  obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o
  obj-$(CONFIG_TCG_TIS) += tpm_tis.o
-obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o
+obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi_mod.o
+tpm_tis_spi_mod-y := tpm_tis_spi.o
+tpm_tis_spi_mod-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
  obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o
  obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o
  obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o

This renames the driver module from tpm_tis_spi to tpm_tis_spi_mod, was 
this done intentionally? When trying to upgrade the kernel, this just 
broke my test system, since all scripts expect to be able to load 
tpm_tis_spi, which does not exist anymore with that change.

Alexander






