tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
Conflicts:
drivers/spi/spi-sh-msiof.c
+1
-1
+1
-1
drivers/spi/spi-sh-msiof.c
+1
-1
drivers/spi/spi-sh-msiof.c
···
84
84
#define MDR1_BITLSB_SHIFT 24 /* MSB/LSB First (1 = LSB first) */
85
85
#define MDR1_DTDL_SHIFT 20 /* Data Pin Bit Delay for MSIOF_SYNC */
86
86
#define MDR1_SYNCDL_SHIFT 16 /* Frame Sync Signal Timing Delay */
87
-
#define MDR1_FLD_MASK 0x000000c0 /* Frame Sync Signal Interval (0-3) */
87
+
#define MDR1_FLD_MASK 0x0000000c /* Frame Sync Signal Interval (0-3) */
88
88
#define MDR1_FLD_SHIFT 2
89
89
#define MDR1_XXSTP 0x00000001 /* Transmission/Reception Stop on FIFO */
90
90
/* TMDR1 */