summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-sh-msiof.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-06 14:06:46 +0300
committerMark Brown <broonie@kernel.org>2015-01-06 14:06:46 +0300
commit6b038c8d2b99b552f0b025c8a134f8a3c417a3e7 (patch)
tree8a2d2b9a0de682a2e9ffe7a265b056fc57492e96 /drivers/spi/spi-sh-msiof.c
parent3110628d89f80fbafa085fd62e75afcb39fb764c (diff)
parent6d40530e4789b3e2f14d61ca57ab02bd5395d5c9 (diff)
downloadlinux-6b038c8d2b99b552f0b025c8a134f8a3c417a3e7.tar.xz
Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
Conflicts: drivers/spi/spi-sh-msiof.c
Diffstat (limited to 'drivers/spi/spi-sh-msiof.c')
-rw-r--r--drivers/spi/spi-sh-msiof.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 2a87cb939f56..6b13836de307 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -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 */