From: Mark Brown <broonie@kernel.org>
Date: Mon, 12 Dec 2016 15:54:09 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/delay', 'spi/topic/dw', 'spi/topic/fsl... 
X-Git-Tag: v4.10-rc1~141^2~3
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=3bc1ad252d4f740a7600ded3bf7bee16043f052d

Merge remote-tracking branches 'spi/topic/delay', 'spi/topic/dw', 'spi/topic/fsl-dspi' and 'spi/topic/fsl-espi' into spi-next
---

3bc1ad252d4f740a7600ded3bf7bee16043f052d
diff --cc drivers/spi/spi-fsl-dspi.c
index a67b0ff6a362,35c0dd945668,35c0dd945668,7ada112bfd85,35c0dd945668..14c8e7ce1913
--- a/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