Merge remote-tracking branches 'spi/topic/delay', 'spi/topic/dw', 'spi/topic/fsl...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-fsl-dspi.c
index a67b0ff6a362380e4f62382c12c557f98a127947,35c0dd94566814c484758bae43d354bf4e282e13,35c0dd94566814c484758bae43d354bf4e282e13,7ada112bfd8542862181f6184242481cdce47847,35c0dd94566814c484758bae43d354bf4e282e13..14c8e7ce1913b0992ef8d9765c983b86b19aa573
--- 1/drivers/spi/spi-fsl-dspi.c
--- 2/drivers/spi/spi-fsl-dspi.c
--- 3/drivers/spi/spi-fsl-dspi.c
--- 4/drivers/spi/spi-fsl-dspi.c
--- 5/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@@@@@ -70,8 -70,7 -70,7 -73,12 -70,7 +73,13 @@@@@@
     #define SPI_SR                     0x2c
     #define SPI_SR_EOQF                0x10000000
     #define SPI_SR_TCFQF               0x80000000
 ++++#define SPI_SR_CLEAR               0xdaad0000
 ++ +
+++ +#define SPI_RSER_TFFFE             BIT(25)
+++ +#define SPI_RSER_TFFFD             BIT(24)
+++ +#define SPI_RSER_RFDFE             BIT(17)
+++ +#define SPI_RSER_RFDFD             BIT(16)
+    
     #define SPI_RSER           0x30
     #define SPI_RSER_EOQFE             0x10000000
     #define SPI_RSER_TCFQE             0x80000000

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