Skip to content

Commit d9de177

Browse files
miquelraynalmiquelraynal
committed
mtd: spinand: Use more specific naming for the (dual IO) read from cache ops
SPI operations have been initially described through macros implicitly implying the use of a single SPI SDR bus. Macros for supporting dual and quad I/O transfers have been added on top, generally inspired by vendor naming, followed by DTR operations. Soon we might see octal and even octal DTR operations as well (including the opcode byte). Let's clarify what the macro really mean by describing the expected bus topology in the (dual IO) read from cache macro names. While at modifying them, better reordering the macros to group them all by bus topology which now feels more intuitive. Acked-by: Tudor Ambarus <[email protected]> Signed-off-by: Miquel Raynal <[email protected]>
1 parent 684f710 commit d9de177

File tree

8 files changed

+31
-31
lines changed

8 files changed

+31
-31
lines changed

‎drivers/mtd/nand/spi/alliancememory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
static SPINAND_OP_VARIANTS(read_cache_variants,
2020
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
2121
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
22-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
22+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
2323
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
2424
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
2525
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));

‎drivers/mtd/nand/spi/gigadevice.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,31 @@
2626
static SPINAND_OP_VARIANTS(read_cache_variants,
2727
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
2828
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
29-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
29+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
3030
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
3131
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
3232
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
3333

3434
static SPINAND_OP_VARIANTS(read_cache_variants_f,
3535
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
3636
SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(0, 1, NULL, 0),
37-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
37+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
3838
SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_2S_OP(0, 1, NULL, 0),
3939
SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(0, 1, NULL, 0),
4040
SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(0, 0, NULL, 0));
4141

4242
static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
4343
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
4444
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
45-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
45+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
4646
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
4747
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
4848
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
4949

5050
static SPINAND_OP_VARIANTS(read_cache_variants_2gq5,
5151
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
5252
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
53-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
53+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 2, NULL, 0),
5454
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
5555
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
5656
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));

‎drivers/mtd/nand/spi/micron.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
static SPINAND_OP_VARIANTS(quadio_read_cache_variants,
3838
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
3939
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
40-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
40+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
4141
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
4242
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
4343
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));

‎drivers/mtd/nand/spi/paragon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
static SPINAND_OP_VARIANTS(read_cache_variants,
2525
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
2626
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
27-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
27+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
2828
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
2929
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
3030
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));

‎drivers/mtd/nand/spi/skyhigh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
static SPINAND_OP_VARIANTS(read_cache_variants,
2020
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
2121
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
22-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
22+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 2, NULL, 0),
2323
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
2424
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
2525
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));

‎drivers/mtd/nand/spi/winbond.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
2828
SPINAND_PAGE_READ_FROM_CACHE_X4_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
2929
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
3030
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
31-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_DTR_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
31+
SPINAND_PAGE_READ_FROM_CACHE_1S_2D_2D_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
3232
SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
33-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
33+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
3434
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
3535
SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
3636
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
@@ -39,7 +39,7 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
3939
static SPINAND_OP_VARIANTS(read_cache_variants,
4040
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
4141
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
42-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
42+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
4343
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
4444
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
4545
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));

‎drivers/mtd/nand/spi/xtx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
static SPINAND_OP_VARIANTS(read_cache_variants,
2626
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
2727
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
28-
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
28+
SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
2929
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
3030
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
3131
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));

‎include/linux/mtd/spinand.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,25 @@
113113
SPI_MEM_DTR_OP_DATA_IN(len, buf, 2), \
114114
SPI_MEM_OP_MAX_FREQ(freq))
115115

116+
#define SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(addr, ndummy, buf, len) \
117+
SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1), \
118+
SPI_MEM_OP_ADDR(2, addr, 2), \
119+
SPI_MEM_OP_DUMMY(ndummy, 2), \
120+
SPI_MEM_OP_DATA_IN(len, buf, 2))
121+
122+
#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_2S_2S_OP(addr, ndummy, buf, len) \
123+
SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1), \
124+
SPI_MEM_OP_ADDR(3, addr, 2), \
125+
SPI_MEM_OP_DUMMY(ndummy, 2), \
126+
SPI_MEM_OP_DATA_IN(len, buf, 2))
127+
128+
#define SPINAND_PAGE_READ_FROM_CACHE_1S_2D_2D_OP(addr, ndummy, buf, len, freq) \
129+
SPI_MEM_OP(SPI_MEM_OP_CMD(0xbd, 1), \
130+
SPI_MEM_DTR_OP_ADDR(2, addr, 2), \
131+
SPI_MEM_DTR_OP_DUMMY(ndummy, 2), \
132+
SPI_MEM_DTR_OP_DATA_IN(len, buf, 2), \
133+
SPI_MEM_OP_MAX_FREQ(freq))
134+
116135
#define SPINAND_PAGE_READ_FROM_CACHE_X4_OP(addr, ndummy, buf, len) \
117136
SPI_MEM_OP(SPI_MEM_OP_CMD(0x6b, 1), \
118137
SPI_MEM_OP_ADDR(2, addr, 1), \
@@ -132,25 +151,6 @@
132151
SPI_MEM_DTR_OP_DATA_IN(len, buf, 4), \
133152
SPI_MEM_OP_MAX_FREQ(freq))
134153

135-
#define SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(addr, ndummy, buf, len) \
136-
SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1), \
137-
SPI_MEM_OP_ADDR(2, addr, 2), \
138-
SPI_MEM_OP_DUMMY(ndummy, 2), \
139-
SPI_MEM_OP_DATA_IN(len, buf, 2))
140-
141-
#define SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP_3A(addr, ndummy, buf, len) \
142-
SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1), \
143-
SPI_MEM_OP_ADDR(3, addr, 2), \
144-
SPI_MEM_OP_DUMMY(ndummy, 2), \
145-
SPI_MEM_OP_DATA_IN(len, buf, 2))
146-
147-
#define SPINAND_PAGE_READ_FROM_CACHE_DUALIO_DTR_OP(addr, ndummy, buf, len, freq) \
148-
SPI_MEM_OP(SPI_MEM_OP_CMD(0xbd, 1), \
149-
SPI_MEM_DTR_OP_ADDR(2, addr, 2), \
150-
SPI_MEM_DTR_OP_DUMMY(ndummy, 2), \
151-
SPI_MEM_DTR_OP_DATA_IN(len, buf, 2), \
152-
SPI_MEM_OP_MAX_FREQ(freq))
153-
154154
#define SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(addr, ndummy, buf, len) \
155155
SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1), \
156156
SPI_MEM_OP_ADDR(2, addr, 4), \

0 commit comments

Comments
 (0)