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

mtd: rawnand: Pass a nand_chip object to chip->read_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->read_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 767eb6fb

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

+3 −4
Original line number Diff line number Diff line
@@ -75,10 +75,9 @@ static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte) 
	gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 1);

}



static u_char ams_delta_read_byte(struct mtd_info *mtd)

static u_char ams_delta_read_byte(struct nand_chip *this)

{

	u_char res;

	struct nand_chip *this = mtd_to_nand(mtd);

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



	gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 0);
@@ -99,12 +98,12 @@ static void ams_delta_write_buf(struct mtd_info *mtd, const u_char *buf, 
		ams_delta_write_byte(mtd, buf[i]);

}



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

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

{

	int i;



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

		buf[i] = ams_delta_read_byte(mtd);

		buf[i] = ams_delta_read_byte(this);

}



/*

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

+4 −6
Original line number Diff line number Diff line
@@ -410,9 +410,8 @@ err: 
	return -EIO;

}



static u8 atmel_nand_read_byte(struct mtd_info *mtd)

static u8 atmel_nand_read_byte(struct nand_chip *chip)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand *nand = to_atmel_nand(chip);



	return ioread8(nand->activecs->io.virt);
@@ -429,9 +428,8 @@ static void atmel_nand_write_byte(struct mtd_info *mtd, u8 byte) 
		iowrite8(byte, nand->activecs->io.virt);

}



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

static void atmel_nand_read_buf(struct nand_chip *chip, 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;
@@ -883,8 +881,8 @@ static int atmel_nand_pmecc_read_pg(struct nand_chip *chip, u8 *buf, 
	if (ret)

		return ret;



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

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

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

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



	ret = atmel_nand_pmecc_correct_data(chip, buf, raw);

drivers/mtd/nand/raw/au1550nd.c

+6 −9
Original line number Diff line number Diff line
@@ -29,13 +29,12 @@ struct au1550nd_ctx { 


/**

 * au_read_byte -  read one byte from the chip

 * @mtd:	MTD device structure

 * @this:	NAND chip object

 *

 * read function for 8bit buswidth

 */

static u_char au_read_byte(struct mtd_info *mtd)

static u_char au_read_byte(struct nand_chip *this)

{

	struct nand_chip *this = mtd_to_nand(mtd);

	u_char ret = readb(this->IO_ADDR_R);

	wmb(); /* drain writebuffer */

	return ret;
@@ -57,13 +56,12 @@ static void au_write_byte(struct mtd_info *mtd, u_char byte) 


/**

 * au_read_byte16 -  read one byte endianness aware from the chip

 * @mtd:	MTD device structure

 * @this:	NAND chip object

 *

 * read function for 16bit buswidth with endianness conversion

 */

static u_char au_read_byte16(struct mtd_info *mtd)

static u_char au_read_byte16(struct nand_chip *this)

{

	struct nand_chip *this = mtd_to_nand(mtd);

	u_char ret = (u_char) cpu_to_le16(readw(this->IO_ADDR_R));

	wmb(); /* drain writebuffer */

	return ret;
@@ -104,16 +102,15 @@ static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len) 


/**

 * au_read_buf -  read chip data into buffer

 * @mtd:	MTD device structure

 * @this:	NAND chip object

 * @buf:	buffer to store date

 * @len:	number of bytes to read

 *

 * read function for 8bit buswidth

 */

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

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

{

	int i;

	struct nand_chip *this = mtd_to_nand(mtd);



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

		buf[i] = readb(this->IO_ADDR_R);

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

+5 −5
Original line number Diff line number Diff line
@@ -310,9 +310,9 @@ static void bcm47xxnflash_ops_bcm4706_cmdfunc(struct mtd_info *mtd, 
	b47n->curr_command = command;

}



static u8 bcm47xxnflash_ops_bcm4706_read_byte(struct mtd_info *mtd)

static u8 bcm47xxnflash_ops_bcm4706_read_byte(struct nand_chip *nand_chip)

{

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct mtd_info *mtd = nand_to_mtd(nand_chip);

	struct bcm47xxnflash *b47n = nand_get_controller_data(nand_chip);

	struct bcma_drv_cc *cc = b47n->cc;

	u32 tmp = 0;
@@ -338,16 +338,16 @@ static u8 bcm47xxnflash_ops_bcm4706_read_byte(struct mtd_info *mtd) 
	return 0;

}



static void bcm47xxnflash_ops_bcm4706_read_buf(struct mtd_info *mtd,

static void bcm47xxnflash_ops_bcm4706_read_buf(struct nand_chip *nand_chip,

					       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_READ0:

	case NAND_CMD_READOOB:

		bcm47xxnflash_ops_bcm4706_read(mtd, buf, len);

		bcm47xxnflash_ops_bcm4706_read(nand_to_mtd(nand_chip), buf,

					       len);

		return;

	}

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

+3 −4
Original line number Diff line number Diff line
@@ -1417,9 +1417,8 @@ static void brcmnand_cmdfunc(struct mtd_info *mtd, unsigned command, 
		brcmnand_wp(mtd, 1);

}



static uint8_t brcmnand_read_byte(struct mtd_info *mtd)

static uint8_t brcmnand_read_byte(struct nand_chip *chip)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct brcmnand_host *host = nand_get_controller_data(chip);

	struct brcmnand_controller *ctrl = host->ctrl;

	uint8_t ret = 0;
@@ -1474,12 +1473,12 @@ static uint8_t brcmnand_read_byte(struct mtd_info *mtd) 
	return ret;

}



static void brcmnand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)

static void brcmnand_read_buf(struct nand_chip *chip, uint8_t *buf, int len)

{

	int i;



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

		*buf = brcmnand_read_byte(mtd);

		*buf = brcmnand_read_byte(chip);

}



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE