From: Mark Brown <broonie@kernel.org>
Date: Tue, 6 Jan 2015 11:06:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6b038c8d2b99b552f0b025c8a134f8a3c417a3e7;p=linux-beck.git

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

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

6b038c8d2b99b552f0b025c8a134f8a3c417a3e7
diff --cc drivers/spi/spi-sh-msiof.c
index 2a87cb939f56,87253eaadd4c..6b13836de307
--- a/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_DTDL_SHIFT		 20 /* Data Pin Bit Delay for MSIOF_SYNC */
 +#define MDR1_SYNCDL_SHIFT	 16 /* Frame Sync Signal Timing Delay */
- #define MDR1_FLD_MASK	 0x000000c0 /* Frame Sync Signal Interval (0-3) */
+ #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 */