Commit 8395b753 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Deprecate ->dev_ready() and ->waitfunc() 



Those hooks have been replaced by ->exec_op(). Move them to the
nand_legacy struct.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent bf6065c6

Documentation/driver-api/mtdnand.rst

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ to read back the state of the pin. The function has no arguments and 
should return 0, if the device is busy (R/B pin is low) and 1, if the

device is ready (R/B pin is high). If the hardware interface does not

give access to the ready busy pin, then the function must not be defined

and the function pointer this->dev_ready is set to NULL.

and the function pointer this->legacy.dev_ready is set to NULL.



Init function

-------------
@@ -242,7 +242,7 @@ necessary information about the device. 
        /* Set command delay time, see datasheet for correct value */

        this->chip_delay = CHIP_DEPENDEND_COMMAND_DELAY;

        /* Assign the device ready function, if available */

        this->dev_ready = board_dev_ready;

        this->legacy.dev_ready = board_dev_ready;

        this->eccmode = NAND_ECC_SOFT;



        /* Scan to find existence of the device */

drivers/mtd/nand/raw/ams-delta.c

+2 −2
Original line number Diff line number Diff line
@@ -215,9 +215,9 @@ static int ams_delta_init(struct platform_device *pdev) 
	this->legacy.read_buf = ams_delta_read_buf;

	this->legacy.cmd_ctrl = ams_delta_hwcontrol;

	if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) {

		this->dev_ready = ams_delta_nand_ready;

		this->legacy.dev_ready = ams_delta_nand_ready;

	} else {

		this->dev_ready = NULL;

		this->legacy.dev_ready = NULL;

		pr_notice("Couldn't request gpio for Delta NAND ready.\n");

	}

	/* 25 us command delay time */

drivers/mtd/nand/raw/atmel/nand-controller.c

+4 −4
Original line number Diff line number Diff line
@@ -488,14 +488,14 @@ static void atmel_nand_select_chip(struct nand_chip *chip, int cs) 


	if (cs < 0 || cs >= nand->numcs) {

		nand->activecs = NULL;

		chip->dev_ready = NULL;

		chip->legacy.dev_ready = NULL;

		return;

	}



	nand->activecs = &nand->cs[cs];



	if (nand->activecs->rb.type == ATMEL_NAND_GPIO_RB)

		chip->dev_ready = atmel_nand_dev_ready;

		chip->legacy.dev_ready = atmel_nand_dev_ready;

}



static int atmel_hsmc_nand_dev_ready(struct nand_chip *chip)
@@ -528,7 +528,7 @@ static void atmel_hsmc_nand_select_chip(struct nand_chip *chip, int cs) 
	}



	if (nand->activecs->rb.type == ATMEL_NAND_NATIVE_RB)

		chip->dev_ready = atmel_hsmc_nand_dev_ready;

		chip->legacy.dev_ready = atmel_hsmc_nand_dev_ready;



	regmap_update_bits(nc->base.smc, ATMEL_HSMC_NFC_CFG,

			   ATMEL_HSMC_NFC_CFG_PAGESIZE_MASK |
@@ -945,7 +945,7 @@ static int atmel_hsmc_nand_pmecc_write_pg(struct nand_chip *chip, 
		dev_err(nc->base.dev, "Failed to program NAND page (err = %d)\n",

			ret);



	status = chip->waitfunc(chip);

	status = chip->legacy.waitfunc(chip);

	if (status & NAND_STATUS_FAIL)

		return -EIO;

drivers/mtd/nand/raw/au1550nd.c

+4 −3
Original line number Diff line number Diff line
@@ -342,7 +342,8 @@ static void au1550_command(struct nand_chip *this, unsigned command, 
		/* Apply a short delay always to ensure that we do wait tWB. */

		ndelay(100);

		/* Wait for a chip to become ready... */

		for (i = this->chip_delay; !this->dev_ready(this) && i > 0; --i)

		for (i = this->chip_delay;

		     !this->legacy.dev_ready(this) && i > 0; --i)

			udelay(1);



		/* Release -CE and re-enable interrupts. */
@@ -353,7 +354,7 @@ static void au1550_command(struct nand_chip *this, unsigned command, 
	/* Apply this short delay always to ensure that we do wait tWB. */

	ndelay(100);



	while(!this->dev_ready(this));

	while(!this->legacy.dev_ready(this));

}



static int find_nand_cs(unsigned long nand_base)
@@ -428,7 +429,7 @@ static int au1550nd_probe(struct platform_device *pdev) 
	}

	ctx->cs = cs;



	this->dev_ready = au1550_device_ready;

	this->legacy.dev_ready = au1550_device_ready;

	this->select_chip = au1550_select_chip;

	this->legacy.cmdfunc = au1550_command;

drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n) 


	b47n->nand_chip.select_chip = bcm47xxnflash_ops_bcm4706_select_chip;

	nand_chip->legacy.cmd_ctrl = bcm47xxnflash_ops_bcm4706_cmd_ctrl;

	nand_chip->dev_ready = bcm47xxnflash_ops_bcm4706_dev_ready;

	nand_chip->legacy.dev_ready = bcm47xxnflash_ops_bcm4706_dev_ready;

	b47n->nand_chip.legacy.cmdfunc = bcm47xxnflash_ops_bcm4706_cmdfunc;

	b47n->nand_chip.legacy.read_byte = bcm47xxnflash_ops_bcm4706_read_byte;

	b47n->nand_chip.legacy.read_buf = bcm47xxnflash_ops_bcm4706_read_buf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE