Commit 50a487e7 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Pass a nand_chip object to chip->dev_ready() 



Let's make the raw NAND API consistent by patching all helpers and
hooks to take a nand_chip object instead of an mtd_info one or
remove the mtd_info object when both are passed.

Let's tackle the chip->dev_ready() hook.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void ams_delta_hwcontrol(struct nand_chip *this, int cmd, 
		ams_delta_write_byte(this, cmd);

}



static int ams_delta_nand_ready(struct mtd_info *mtd)

static int ams_delta_nand_ready(struct nand_chip *this)

{

	return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB);

}

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

+2 −4
Original line number Diff line number Diff line
@@ -475,9 +475,8 @@ static void atmel_nand_write_buf(struct nand_chip *chip, const u8 *buf, int len) 
		iowrite8_rep(nand->activecs->io.virt, buf, len);

}



static int atmel_nand_dev_ready(struct mtd_info *mtd)

static int atmel_nand_dev_ready(struct nand_chip *chip)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand *nand = to_atmel_nand(chip);



	return gpiod_get_value(nand->activecs->rb.gpio);
@@ -499,9 +498,8 @@ static void atmel_nand_select_chip(struct nand_chip *chip, int cs) 
		chip->dev_ready = atmel_nand_dev_ready;

}



static int atmel_hsmc_nand_dev_ready(struct mtd_info *mtd)

static int atmel_hsmc_nand_dev_ready(struct nand_chip *chip)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand *nand = to_atmel_nand(chip);

	struct atmel_hsmc_nand_controller *nc;

	u32 status;

drivers/mtd/nand/raw/au1550nd.c

+3 −3
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void au1550_hwcontrol(struct mtd_info *mtd, int cmd) 
	wmb(); /* Drain the writebuffer */

}



int au1550_device_ready(struct mtd_info *mtd)

int au1550_device_ready(struct nand_chip *this)

{

	return (alchemy_rdsmem(AU1000_MEM_STSTAT) & 0x1) ? 1 : 0;

}
@@ -341,7 +341,7 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i 
		/* 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(mtd) && i > 0; --i)

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

			udelay(1);



		/* Release -CE and re-enable interrupts. */
@@ -352,7 +352,7 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i 
	/* Apply this short delay always to ensure that we do wait tWB. */

	ndelay(100);



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

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

}



static int find_nand_cs(unsigned long nand_base)

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

+1 −2
Original line number Diff line number Diff line
@@ -196,9 +196,8 @@ static void bcm47xxnflash_ops_bcm4706_select_chip(struct nand_chip *chip, 
	return;

}



static int bcm47xxnflash_ops_bcm4706_dev_ready(struct mtd_info *mtd)

static int bcm47xxnflash_ops_bcm4706_dev_ready(struct nand_chip *nand_chip)

{

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = nand_get_controller_data(nand_chip);



	return !!(bcma_cc_read32(b47n->cc, BCMA_CC_NFLASH_CTL) & NCTL_READY);

drivers/mtd/nand/raw/cafe_nand.c

+1 −2
Original line number Diff line number Diff line
@@ -100,9 +100,8 @@ static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL }; 
#define cafe_readl(cafe, addr)			readl((cafe)->mmio + CAFE_##addr)

#define cafe_writel(cafe, datum, addr)		writel(datum, (cafe)->mmio + CAFE_##addr)



static int cafe_device_ready(struct mtd_info *mtd)

static int cafe_device_ready(struct nand_chip *chip)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct cafe_priv *cafe = nand_get_controller_data(chip);

	int result = !!(cafe_readl(cafe, NAND_STATUS) & 0x40000000);

	uint32_t irqs = cafe_readl(cafe, NAND_IRQ);

CRA Git | Maintained and supported by SUSTech CRA and CCSE