Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/fsl-espi', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
index 78f24ca36fcf017e6159c394df64fdf2af142d34,78f24ca36fcf017e6159c394df64fdf2af142d34,78f24ca36fcf017e6159c394df64fdf2af142d34,78f24ca36fcf017e6159c394df64fdf2af142d34,37dc2e7d2c7e640d6c57b94e9a085b1594516e8c,9b8a7472b5b87b68e914098031002fa01d4adcb4..6b9d2ac629cce6ca7e886df22c2fb5b02874373c
--- 1/drivers/spi/Makefile
--- 2/drivers/spi/Makefile
--- 3/drivers/spi/Makefile
--- 4/drivers/spi/Makefile
--- 5/drivers/spi/Makefile
--- 6/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@@@@@ -40,8 -40,8 -40,8 -40,8 -40,9 -40,9 +40,10 @@@@@@@ obj-$(CONFIG_SPI_FSL_LIB)            += spi-fsl-l
      obj-$(CONFIG_SPI_FSL_ESPI)                += spi-fsl-espi.o
      obj-$(CONFIG_SPI_FSL_SPI)         += spi-fsl-spi.o
      obj-$(CONFIG_SPI_GPIO)                    += spi-gpio.o
++++ +obj-$(CONFIG_SPI_IMG_SPFI)                += spi-img-spfi.o
      obj-$(CONFIG_SPI_IMX)                     += spi-imx.o
      obj-$(CONFIG_SPI_LM70_LLP)                += spi-lm70llp.o
+++++ obj-$(CONFIG_SPI_MESON_SPIFC)             += spi-meson-spifc.o
      obj-$(CONFIG_SPI_MPC512x_PSC)             += spi-mpc512x-psc.o
      obj-$(CONFIG_SPI_MPC52xx_PSC)             += spi-mpc52xx-psc.o
      obj-$(CONFIG_SPI_MPC52xx)         += spi-mpc52xx.o

diff --cc drivers/spi/spi-fsl-dspi.c
Simple merge