Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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



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 all chip->write_xxx() hooks at once.

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

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

+4 −5
Original line number Diff line number Diff line
@@ -63,9 +63,8 @@ static const struct mtd_partition partition_info[] = { 
	  .size		=  3 * SZ_256K },

};



static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte)

static void ams_delta_write_byte(struct nand_chip *this, u_char byte)

{

	struct nand_chip *this = mtd_to_nand(mtd);

	void __iomem *io_base = (void __iomem *)nand_get_controller_data(this);



	writew(0, io_base + OMAP_MPUIO_IO_CNTL);
@@ -89,13 +88,13 @@ static u_char ams_delta_read_byte(struct nand_chip *this) 
	return res;

}



static void ams_delta_write_buf(struct mtd_info *mtd, const u_char *buf,

static void ams_delta_write_buf(struct nand_chip *this, const u_char *buf,

				int len)

{

	int i;



	for (i=0; i<len; i++)

		ams_delta_write_byte(mtd, buf[i]);

		ams_delta_write_byte(this, buf[i]);

}



static void ams_delta_read_buf(struct nand_chip *this, u_char *buf, int len)
@@ -128,7 +127,7 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd, 
	}



	if (cmd != NAND_CMD_NONE)

		ams_delta_write_byte(mtd, cmd);

		ams_delta_write_byte(mtd_to_nand(mtd), cmd);

}



static int ams_delta_nand_ready(struct mtd_info *mtd)

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

+5 −7
Original line number Diff line number Diff line
@@ -417,9 +417,8 @@ static u8 atmel_nand_read_byte(struct nand_chip *chip) 
	return ioread8(nand->activecs->io.virt);

}



static void atmel_nand_write_byte(struct mtd_info *mtd, u8 byte)

static void atmel_nand_write_byte(struct nand_chip *chip, u8 byte)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand *nand = to_atmel_nand(chip);



	if (chip->options & NAND_BUSWIDTH_16)
@@ -452,9 +451,8 @@ static void atmel_nand_read_buf(struct nand_chip *chip, u8 *buf, int len) 
		ioread8_rep(nand->activecs->io.virt, buf, len);

}



static void atmel_nand_write_buf(struct mtd_info *mtd, const u8 *buf, int len)

static void atmel_nand_write_buf(struct nand_chip *chip, const u8 *buf, int len)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand *nand = to_atmel_nand(chip);

	struct atmel_nand_controller *nc;
@@ -841,7 +839,7 @@ static int atmel_nand_pmecc_write_pg(struct nand_chip *chip, const u8 *buf, 
	if (ret)

		return ret;



	atmel_nand_write_buf(mtd, buf, mtd->writesize);

	atmel_nand_write_buf(chip, buf, mtd->writesize);



	ret = atmel_nand_pmecc_generate_eccbytes(chip, raw);

	if (ret) {
@@ -851,7 +849,7 @@ static int atmel_nand_pmecc_write_pg(struct nand_chip *chip, const u8 *buf, 


	atmel_nand_pmecc_disable(chip, raw);



	atmel_nand_write_buf(mtd, chip->oob_poi, mtd->oobsize);

	atmel_nand_write_buf(chip, chip->oob_poi, mtd->oobsize);



	return nand_prog_page_end_op(chip);

}
@@ -942,7 +940,7 @@ static int atmel_hsmc_nand_pmecc_write_pg(struct nand_chip *chip, 
	if (ret)

		return ret;



	atmel_nand_write_buf(mtd, chip->oob_poi, mtd->oobsize);

	atmel_nand_write_buf(chip, chip->oob_poi, mtd->oobsize);



	nc->op.cmds[0] = NAND_CMD_PAGEPROG;

	nc->op.ncmds = 1;

drivers/mtd/nand/raw/au1550nd.c

+15 −19
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct au1550nd_ctx { 


	int cs;

	void __iomem *base;

	void (*write_byte)(struct mtd_info *, u_char);

	void (*write_byte)(struct nand_chip *, u_char);

};



/**
@@ -42,14 +42,13 @@ static u_char au_read_byte(struct nand_chip *this) 


/**

 * au_write_byte -  write one byte to the chip

 * @mtd:	MTD device structure

 * @this:	NAND chip object

 * @byte:	pointer to data byte to write

 *

 * write function for 8it buswidth

 */

static void au_write_byte(struct mtd_info *mtd, u_char byte)

static void au_write_byte(struct nand_chip *this, u_char byte)

{

	struct nand_chip *this = mtd_to_nand(mtd);

	writeb(byte, this->IO_ADDR_W);

	wmb(); /* drain writebuffer */

}
@@ -69,30 +68,28 @@ static u_char au_read_byte16(struct nand_chip *this) 


/**

 * au_write_byte16 -  write one byte endianness aware to the chip

 * @mtd:	MTD device structure

 * @this:	NAND chip object

 * @byte:	pointer to data byte to write

 *

 * write function for 16bit buswidth with endianness conversion

 */

static void au_write_byte16(struct mtd_info *mtd, u_char byte)

static void au_write_byte16(struct nand_chip *this, u_char byte)

{

	struct nand_chip *this = mtd_to_nand(mtd);

	writew(le16_to_cpu((u16) byte), this->IO_ADDR_W);

	wmb(); /* drain writebuffer */

}



/**

 * au_write_buf -  write buffer to chip

 * @mtd:	MTD device structure

 * @this:	NAND chip object

 * @buf:	data buffer

 * @len:	number of bytes to write

 *

 * write function for 8bit buswidth

 */

static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len)

static void au_write_buf(struct nand_chip *this, const u_char *buf, int len)

{

	int i;

	struct nand_chip *this = mtd_to_nand(mtd);



	for (i = 0; i < len; i++) {

		writeb(buf[i], this->IO_ADDR_W);
@@ -120,16 +117,15 @@ static void au_read_buf(struct nand_chip *this, u_char *buf, int len) 


/**

 * au_write_buf16 -  write buffer to chip

 * @mtd:	MTD device structure

 * @this:	NAND chip object

 * @buf:	data buffer

 * @len:	number of bytes to write

 *

 * write function for 16bit buswidth

 */

static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)

static void au_write_buf16(struct nand_chip *this, const u_char *buf, int len)

{

	int i;

	struct nand_chip *this = mtd_to_nand(mtd);

	u16 *p = (u16 *) buf;

	len >>= 1;
@@ -272,9 +268,9 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i 
			column -= 256;

			readcmd = NAND_CMD_READ1;

		}

		ctx->write_byte(mtd, readcmd);

		ctx->write_byte(this, readcmd);

	}

	ctx->write_byte(mtd, command);

	ctx->write_byte(this, command);



	/* Set ALE and clear CLE to start address cycle */

	au1550_hwcontrol(mtd, NAND_CTL_CLRCLE);
@@ -288,10 +284,10 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i 
			if (this->options & NAND_BUSWIDTH_16 &&

					!nand_opcode_8bits(command))

				column >>= 1;

			ctx->write_byte(mtd, column);

			ctx->write_byte(this, column);

		}

		if (page_addr != -1) {

			ctx->write_byte(mtd, (u8)(page_addr & 0xff));

			ctx->write_byte(this, (u8)(page_addr & 0xff));



			if (command == NAND_CMD_READ0 ||

			    command == NAND_CMD_READ1 ||
@@ -309,10 +305,10 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i 
				au1550_hwcontrol(mtd, NAND_CTL_SETNCE);

			}



			ctx->write_byte(mtd, (u8)(page_addr >> 8));

			ctx->write_byte(this, (u8)(page_addr >> 8));



			if (this->options & NAND_ROW_ADDR_3)

				ctx->write_byte(mtd,

				ctx->write_byte(this,

						((page_addr >> 16) & 0x0f));

		}

		/* Latch in address */

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

+3 −3
Original line number Diff line number Diff line
@@ -354,15 +354,15 @@ static void bcm47xxnflash_ops_bcm4706_read_buf(struct nand_chip *nand_chip, 
	pr_err("Invalid command for buf read: 0x%X\n", b47n->curr_command);

}



static void bcm47xxnflash_ops_bcm4706_write_buf(struct mtd_info *mtd,

static void bcm47xxnflash_ops_bcm4706_write_buf(struct nand_chip *nand_chip,

						const uint8_t *buf, int len)

{

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = nand_get_controller_data(nand_chip);



	switch (b47n->curr_command) {

	case NAND_CMD_SEQIN:

		bcm47xxnflash_ops_bcm4706_write(mtd, buf, len);

		bcm47xxnflash_ops_bcm4706_write(nand_to_mtd(nand_chip), buf,

						len);

		return;

	}

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+2 −3
Original line number Diff line number Diff line
@@ -1481,11 +1481,10 @@ static void brcmnand_read_buf(struct nand_chip *chip, uint8_t *buf, int len) 
		*buf = brcmnand_read_byte(chip);

}



static void brcmnand_write_buf(struct mtd_info *mtd, const uint8_t *buf,

static void brcmnand_write_buf(struct nand_chip *chip, const uint8_t *buf,

			       int len)

{

	int i;

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct brcmnand_host *host = nand_get_controller_data(chip);



	switch (host->last_cmd) {