Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof

Conflicts:
	drivers/spi/spi-sh-msiof.c

diff --cc drivers/spi/spi-sh-msiof.c
index 2a87cb939f568849de275fec4ee7aa793ad4a373,87253eaadd4cfa5489af322d5c6afc72b7efa60f..6b13836de30762bfb248d62902786230fdfce67d
--- 1/drivers/spi/spi-sh-msiof.c
--- 2/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@@ -82,9 -82,7 +82,9 @@@ struct sh_msiof_spi_priv 
  #define MDR1_SYNCMD_LR         0x30000000 /*   L/R mode */
  #define MDR1_SYNCAC_SHIFT      25 /* Sync Polarity (1 = Active-low) */
  #define MDR1_BITLSB_SHIFT      24 /* MSB/LSB First (1 = LSB first) */
- #define MDR1_FLD_MASK  0x000000c0 /* Frame Sync Signal Interval (0-3) */
 +#define MDR1_DTDL_SHIFT                20 /* Data Pin Bit Delay for MSIOF_SYNC */
 +#define MDR1_SYNCDL_SHIFT      16 /* Frame Sync Signal Timing Delay */
+ #define MDR1_FLD_MASK  0x0000000c /* Frame Sync Signal Interval (0-3) */
  #define MDR1_FLD_SHIFT                  2
  #define MDR1_XXSTP     0x00000001 /* Transmission/Reception Stop on FIFO */
  /* TMDR1 */