From: Arnd Bergmann <arnd@arndb.de>

The assumption that the build dependency was not necessary turned
out to be wrong, as building SPI_FSI without FSI results in a link
failure:

aarch64-linux-ld: drivers/spi/spi-fsi.o: in function `fsi_spi_check_status':
spi-fsi.c:(.text+0x54): undefined reference to `fsi_device_read'
aarch64-linux-ld: drivers/spi/spi-fsi.o: in function `fsi_spi_read_reg':
spi-fsi.c:(.text+0x120): undefined reference to `fsi_device_write'
aarch64-linux-ld: spi-fsi.c:(.text+0x170): undefined reference to `fsi_device_read'

Fixes: f916c7080d28 ("spi: fsi: Make available for build test")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
If possible, maybe just drop the original patch, rather than adding
this revert
---
 drivers/spi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index fd681a668c3c..1a9a7390d595 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -357,7 +357,7 @@ config SPI_FALCON
 
 config SPI_FSI
 	tristate "FSI SPI driver"
-	depends on FSI || COMPILE_TEST
+	depends on FSI
 	help
 	  This enables support for the driver for FSI bus attached SPI
 	  controllers.
-- 
2.39.2

On Fri, 10 Mar 2023 15:05:37 +0100, Arnd Bergmann wrote:
> The assumption that the build dependency was not necessary turned
> out to be wrong, as building SPI_FSI without FSI results in a link
> failure:
> 
> aarch64-linux-ld: drivers/spi/spi-fsi.o: in function `fsi_spi_check_status':
> spi-fsi.c:(.text+0x54): undefined reference to `fsi_device_read'
> aarch64-linux-ld: drivers/spi/spi-fsi.o: in function `fsi_spi_read_reg':
> spi-fsi.c:(.text+0x120): undefined reference to `fsi_device_write'
> aarch64-linux-ld: spi-fsi.c:(.text+0x170): undefined reference to `fsi_device_read'
> 
> [...]

Applied to

   broonie/spi.git for-next

Thanks!

[1/1] spi: fsi: restore CONFIG_FSI dependency
      commit: bae4ae831a43a1e695bdb6c242bad2454519cb2a

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark