Merge remote-tracking branches 'spi/topic/delay', 'spi/topic/dw', 'spi/topic/fsl...
authorMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:54:09 +0000 (15:54 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:54:09 +0000 (15:54 +0000)
1  2  3  4  5 
drivers/spi/Kconfig
drivers/spi/spi-fsl-dspi.c
drivers/spi/spi.c

Simple merge
index a67b0ff6a362380e4f62382c12c557f98a127947,35c0dd94566814c484758bae43d354bf4e282e13,35c0dd94566814c484758bae43d354bf4e282e13,7ada112bfd8542862181f6184242481cdce47847,35c0dd94566814c484758bae43d354bf4e282e13..14c8e7ce1913b0992ef8d9765c983b86b19aa573
     #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
Simple merge