Skip to content

Commit 684f710

Browse files
miquelraynalmiquelraynal
committed
mtd: spinand: Use more specific naming for the (dual output) 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 output) read from cache macro names. Acked-by: Tudor Ambarus <[email protected]> Signed-off-by: Miquel Raynal <[email protected]>
1 parent ea2087d commit 684f710

File tree

12 files changed

+20
-20
lines changed

12 files changed

+20
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ 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),
2222
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
23-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
23+
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));
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
static SPINAND_OP_VARIANTS(read_cache_variants,
2121
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
22-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
22+
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
2323
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
2424
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
2525

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
static SPINAND_OP_VARIANTS(read_cache_variants,
1515
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
16-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
16+
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
1717
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
1818
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
1919

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ 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),
2929
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
30-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
30+
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),
3737
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
38-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP_3A(0, 1, NULL, 0),
38+
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),
4545
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
46-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
46+
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),
5353
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
54-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
54+
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));
5757

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct macronix_priv {
2929

3030
static SPINAND_OP_VARIANTS(read_cache_variants,
3131
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
32-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
32+
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
3333
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
3434
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
3535

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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),
4040
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
41-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
41+
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));
4444

@@ -53,7 +53,7 @@ static SPINAND_OP_VARIANTS(x4_update_cache_variants,
5353
/* Micron MT29F2G01AAAED Device */
5454
static SPINAND_OP_VARIANTS(x4_read_cache_variants,
5555
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
56-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
56+
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
5757
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
5858
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
5959

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ 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),
2727
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
28-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
28+
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));
3131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ 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),
2222
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
23-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
23+
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));
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
static SPINAND_OP_VARIANTS(read_cache_variants,
1818
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
19-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
19+
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
2020
SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
2121
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
2222

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
2929
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
3030
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
3131
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_DTR_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
32-
SPINAND_PAGE_READ_FROM_CACHE_X2_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
32+
SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
3333
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
34-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
34+
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),
3737
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0, 54 * HZ_PER_MHZ));
@@ -40,7 +40,7 @@ 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),
4242
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
43-
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
43+
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));
4646

0 commit comments

Comments
 (0)