Skip to content

Commit ac3a4b1

Browse files
miquelraynalmiquelraynal
committed
mtd: spinand: Use more specific naming for the (quad) program load op
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 means by describing the expected bus topology in the (quad) program load macro name. While at modifying it, better add the missing_ OP suffix to align with all the other macros of the same kind. Acked-by: Tudor Ambarus <tudor.ambarus@linaro.org> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
1 parent 07cdbae commit ac3a4b1

13 files changed

Lines changed: 25 additions & 25 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
2525
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
2626

2727
static SPINAND_OP_VARIANTS(write_cache_variants,
28-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
28+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
2929
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
3030

3131
static SPINAND_OP_VARIANTS(update_cache_variants,
32-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
32+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
3333
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
3434

3535
static int am_get_eccsize(struct mtd_info *mtd)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
1919
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
2020

2121
static SPINAND_OP_VARIANTS(write_cache_variants,
22-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
22+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
2323
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
2424

2525
static SPINAND_OP_VARIANTS(update_cache_variants,
26-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
26+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
2727
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
2828

2929

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
2424
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
2525

2626
static SPINAND_OP_VARIANTS(write_cache_variants,
27-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
27+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
2828
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
2929

3030
static SPINAND_OP_VARIANTS(update_cache_variants,
31-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
31+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
3232
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
3333

3434
/*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
1818
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
1919

2020
static SPINAND_OP_VARIANTS(write_cache_variants,
21-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
21+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
2222
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
2323

2424
static SPINAND_OP_VARIANTS(update_cache_variants,
25-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
25+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
2626
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
2727

2828
static int f35sqa002g_ooblayout_ecc(struct mtd_info *mtd, int section,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants_2gq5,
5656
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
5757

5858
static SPINAND_OP_VARIANTS(write_cache_variants,
59-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
59+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
6060
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
6161

6262
static SPINAND_OP_VARIANTS(update_cache_variants,
63-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
63+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
6464
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
6565

6666
static int gd5fxgq4xa_ooblayout_ecc(struct mtd_info *mtd, int section,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
3434
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
3535

3636
static SPINAND_OP_VARIANTS(write_cache_variants,
37-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
37+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
3838
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
3939

4040
static SPINAND_OP_VARIANTS(update_cache_variants,
41-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
41+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
4242
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
4343

4444
static int mx35lfxge4ab_ooblayout_ecc(struct mtd_info *mtd, int section,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ static SPINAND_OP_VARIANTS(quadio_read_cache_variants,
4343
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
4444

4545
static SPINAND_OP_VARIANTS(x4_write_cache_variants,
46-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
46+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
4747
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
4848

4949
static SPINAND_OP_VARIANTS(x4_update_cache_variants,
50-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
50+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
5151
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
5252

5353
/* Micron MT29F2G01AAAED Device */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
3030
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
3131

3232
static SPINAND_OP_VARIANTS(write_cache_variants,
33-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
33+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
3434
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
3535

3636
static SPINAND_OP_VARIANTS(update_cache_variants,
37-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
37+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
3838
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
3939

4040

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
2525
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
2626

2727
static SPINAND_OP_VARIANTS(write_cache_variants,
28-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
28+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
2929
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
3030

3131
static SPINAND_OP_VARIANTS(update_cache_variants,
32-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
32+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
3333
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
3434

3535
static int skyhigh_spinand_ooblayout_ecc(struct mtd_info *mtd, int section,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
2121
SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
2222

2323
static SPINAND_OP_VARIANTS(write_cache_x4_variants,
24-
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
24+
SPINAND_PROG_LOAD_1S_1S_4S_OP(true, 0, NULL, 0),
2525
SPINAND_PROG_LOAD_1S_1S_1S_OP(true, 0, NULL, 0));
2626

2727
static SPINAND_OP_VARIANTS(update_cache_x4_variants,
28-
SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
28+
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
2929
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
3030

3131
/*

0 commit comments

Comments
 (0)