| Message ID | 1471505884-33996-2-git-send-email-B56489@freescale.com |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Aug 18, 2016 at 2:37 AM, Yunhui Cui <B56489@freescale.com> wrote: > There are some read modes for flash, such as NORMAL, FAST, > QUAD, DDR QUAD. These modes will use the identical lut table base > So rename SEQID_QUAD_READ to SEQID_READ. > > Signed-off-by: Yunhui Cui <B56489@freescale.com> > Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com> > --- > drivers/mtd/spi-nor/fsl-quadspi.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c > index 5ad6402..21c77e8 100644 > --- a/drivers/mtd/spi-nor/fsl-quadspi.c > +++ b/drivers/mtd/spi-nor/fsl-quadspi.c > @@ -193,7 +193,7 @@ > #define QUADSPI_LUT_NUM 64 > > /* SEQID -- we can have 16 seqids at most. */ > -#define SEQID_QUAD_READ 0 > +#define SEQID_READ 0 > #define SEQID_WREN 1 > #define SEQID_WRDI 2 > #define SEQID_RDSR 3 > @@ -386,8 +386,8 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q) > for (i = 0; i < QUADSPI_LUT_NUM; i++) > qspi_writel(q, 0, base + QUADSPI_LUT_BASE + i * 4); > > - /* Quad Read */ > - lut_base = SEQID_QUAD_READ * 4; > + /* Read */ > + lut_base = SEQID_READ * 4; > > qspi_writel(q, LUT0(CMD, PAD1, read_op) | LUT1(ADDR, PAD1, addrlen), > base + QUADSPI_LUT(lut_base)); > @@ -468,7 +468,7 @@ static int fsl_qspi_get_seqid(struct fsl_qspi *q, u8 cmd) > { > switch (cmd) { > case SPINOR_OP_READ_1_1_4: > - return SEQID_QUAD_READ; > + return SEQID_READ; > case SPINOR_OP_WREN: > return SEQID_WREN; > case SPINOR_OP_WRDI: > -- > 2.1.0.27.g96db324 > > Acked-by: Han xu <han.xu@nxp.com> > ______________________________________________________ > Linux MTD discussion mailing list > http://lists.infradead.org/mailman/listinfo/linux-mtd/
Le 18/08/2016 à 09:37, Yunhui Cui a écrit : > There are some read modes for flash, such as NORMAL, FAST, > QUAD, DDR QUAD. These modes will use the identical lut table base > So rename SEQID_QUAD_READ to SEQID_READ. > > Signed-off-by: Yunhui Cui <B56489@freescale.com> > Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com> Applied to the spi-nor tree. Thanks! > --- > drivers/mtd/spi-nor/fsl-quadspi.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c > index 5ad6402..21c77e8 100644 > --- a/drivers/mtd/spi-nor/fsl-quadspi.c > +++ b/drivers/mtd/spi-nor/fsl-quadspi.c > @@ -193,7 +193,7 @@ > #define QUADSPI_LUT_NUM 64 > > /* SEQID -- we can have 16 seqids at most. */ > -#define SEQID_QUAD_READ 0 > +#define SEQID_READ 0 > #define SEQID_WREN 1 > #define SEQID_WRDI 2 > #define SEQID_RDSR 3 > @@ -386,8 +386,8 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q) > for (i = 0; i < QUADSPI_LUT_NUM; i++) > qspi_writel(q, 0, base + QUADSPI_LUT_BASE + i * 4); > > - /* Quad Read */ > - lut_base = SEQID_QUAD_READ * 4; > + /* Read */ > + lut_base = SEQID_READ * 4; > > qspi_writel(q, LUT0(CMD, PAD1, read_op) | LUT1(ADDR, PAD1, addrlen), > base + QUADSPI_LUT(lut_base)); > @@ -468,7 +468,7 @@ static int fsl_qspi_get_seqid(struct fsl_qspi *q, u8 cmd) > { > switch (cmd) { > case SPINOR_OP_READ_1_1_4: > - return SEQID_QUAD_READ; > + return SEQID_READ; > case SPINOR_OP_WREN: > return SEQID_WREN; > case SPINOR_OP_WRDI: >
diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index 5ad6402..21c77e8 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -193,7 +193,7 @@ #define QUADSPI_LUT_NUM 64 /* SEQID -- we can have 16 seqids at most. */ -#define SEQID_QUAD_READ 0 +#define SEQID_READ 0 #define SEQID_WREN 1 #define SEQID_WRDI 2 #define SEQID_RDSR 3 @@ -386,8 +386,8 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q) for (i = 0; i < QUADSPI_LUT_NUM; i++) qspi_writel(q, 0, base + QUADSPI_LUT_BASE + i * 4); - /* Quad Read */ - lut_base = SEQID_QUAD_READ * 4; + /* Read */ + lut_base = SEQID_READ * 4; qspi_writel(q, LUT0(CMD, PAD1, read_op) | LUT1(ADDR, PAD1, addrlen), base + QUADSPI_LUT(lut_base)); @@ -468,7 +468,7 @@ static int fsl_qspi_get_seqid(struct fsl_qspi *q, u8 cmd) { switch (cmd) { case SPINOR_OP_READ_1_1_4: - return SEQID_QUAD_READ; + return SEQID_READ; case SPINOR_OP_WREN: return SEQID_WREN; case SPINOR_OP_WRDI: