lkml.org 
[lkml]   [2019]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [RESEND PATCH v3 03/20] mtd: spi-nor: Drop quad_enable() from 'struct spi-nor'
    From
    Date


    On 26/08/19 5:38 PM, Tudor.Ambarus@microchip.com wrote:
    > From: Tudor Ambarus <tudor.ambarus@microchip.com>
    >
    > All flash parameters and settings should reside inside
    > 'struct spi_nor_flash_parameter'. Drop the local copy of
    > quad_enable() and use the one from 'struct spi_nor_flash_parameter'.
    >
    > Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
    > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
    > ---

    Reviewed-by: Vignesh Raghavendra <vigneshr@ti.com>

    Regards
    Vignesh

    > v3: Collect R-b
    >
    > drivers/mtd/spi-nor/spi-nor.c | 40 +++++++++++++++++++++++-----------------
    > include/linux/mtd/spi-nor.h | 2 --
    > 2 files changed, 23 insertions(+), 19 deletions(-)
    >
    > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
    > index e9b9cd70a999..effda372cb33 100644
    > --- a/drivers/mtd/spi-nor/spi-nor.c
    > +++ b/drivers/mtd/spi-nor/spi-nor.c
    > @@ -4403,7 +4403,6 @@ static int spi_nor_setup(struct spi_nor *nor,
    > {
    > struct spi_nor_flash_parameter *params = &nor->params;
    > u32 ignored_mask, shared_mask;
    > - bool enable_quad_io;
    > int err;
    >
    > /*
    > @@ -4457,23 +4456,33 @@ static int spi_nor_setup(struct spi_nor *nor,
    > return err;
    > }
    >
    > - /* Enable Quad I/O if needed. */
    > - enable_quad_io = (spi_nor_get_protocol_width(nor->read_proto) == 4 ||
    > - spi_nor_get_protocol_width(nor->write_proto) == 4);
    > - if (enable_quad_io && params->quad_enable)
    > - nor->quad_enable = params->quad_enable;
    > - else
    > - nor->quad_enable = NULL;
    > -
    > return 0;
    > }
    >
    > +/**
    > + * spi_nor_quad_enable() - enable Quad I/O if needed.
    > + * @nor: pointer to a 'struct spi_nor'
    > + *
    > + * Return: 0 on success, -errno otherwise.
    > + */
    > +static int spi_nor_quad_enable(struct spi_nor *nor)
    > +{
    > + if (!nor->params.quad_enable)
    > + return 0;
    > +
    > + if (!(spi_nor_get_protocol_width(nor->read_proto) == 4 ||
    > + spi_nor_get_protocol_width(nor->write_proto) == 4))
    > + return 0;
    > +
    > + return nor->params.quad_enable(nor);
    > +}
    > +
    > static int spi_nor_init(struct spi_nor *nor)
    > {
    > int err;
    >
    > if (nor->clear_sr_bp) {
    > - if (nor->quad_enable == spansion_quad_enable)
    > + if (nor->params.quad_enable == spansion_quad_enable)
    > nor->clear_sr_bp = spi_nor_spansion_clear_sr_bp;
    >
    > err = nor->clear_sr_bp(nor);
    > @@ -4484,12 +4493,10 @@ static int spi_nor_init(struct spi_nor *nor)
    > }
    > }
    >
    > - if (nor->quad_enable) {
    > - err = nor->quad_enable(nor);
    > - if (err) {
    > - dev_err(nor->dev, "quad mode not supported\n");
    > - return err;
    > - }
    > + err = spi_nor_quad_enable(nor);
    > + if (err) {
    > + dev_err(nor->dev, "quad mode not supported\n");
    > + return err;
    > }
    >
    > if (nor->addr_width == 4 && !(nor->flags & SNOR_F_4B_OPCODES)) {
    > @@ -4706,7 +4713,6 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
    > * - select op codes for (Fast) Read, Page Program and Sector Erase.
    > * - set the number of dummy cycles (mode cycles + wait states).
    > * - set the SPI protocols for register and memory accesses.
    > - * - set the Quad Enable bit if needed (required by SPI x-y-4 protos).
    > */
    > ret = spi_nor_setup(nor, hwcaps);
    > if (ret)
    > diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
    > index 77ba692d9348..17787238f0e9 100644
    > --- a/include/linux/mtd/spi-nor.h
    > +++ b/include/linux/mtd/spi-nor.h
    > @@ -535,7 +535,6 @@ struct flash_info;
    > * @flash_unlock: [FLASH-SPECIFIC] unlock a region of the SPI NOR
    > * @flash_is_locked: [FLASH-SPECIFIC] check if a region of the SPI NOR is
    > * completely locked
    > - * @quad_enable: [FLASH-SPECIFIC] enables SPI NOR quad mode
    > * @clear_sr_bp: [FLASH-SPECIFIC] clears the Block Protection Bits from
    > * the SPI NOR Status Register.
    > * @params: [FLASH-SPECIFIC] SPI-NOR flash parameters and settings.
    > @@ -579,7 +578,6 @@ struct spi_nor {
    > int (*flash_lock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
    > int (*flash_unlock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
    > int (*flash_is_locked)(struct spi_nor *nor, loff_t ofs, uint64_t len);
    > - int (*quad_enable)(struct spi_nor *nor);
    > int (*clear_sr_bp)(struct spi_nor *nor);
    > struct spi_nor_flash_parameter params;
    >
    >

    --
    Regards
    Vignesh

    \
     
     \ /
      Last update: 2019-08-27 06:48    [W:2.410 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site