Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b038c8d authored by Mark Brown's avatar Mark Brown
Browse files

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

Conflicts:
	drivers/spi/spi-sh-msiof.c
parents 3110628d 6d40530e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct sh_msiof_spi_priv {
#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 */