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

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

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



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->select_chip() hook.

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

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

+4 −5
Original line number Diff line number Diff line
@@ -483,9 +483,8 @@ static int atmel_nand_dev_ready(struct mtd_info *mtd) 
	return gpiod_get_value(nand->activecs->rb.gpio);

}



static void atmel_nand_select_chip(struct mtd_info *mtd, int cs)

static void atmel_nand_select_chip(struct nand_chip *chip, int cs)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand *nand = to_atmel_nand(chip);



	if (cs < 0 || cs >= nand->numcs) {
@@ -514,15 +513,15 @@ static int atmel_hsmc_nand_dev_ready(struct mtd_info *mtd) 
	return status & ATMEL_HSMC_NFC_SR_RBEDGE(nand->activecs->rb.id);

}



static void atmel_hsmc_nand_select_chip(struct mtd_info *mtd, int cs)

static void atmel_hsmc_nand_select_chip(struct nand_chip *chip, int cs)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct atmel_nand *nand = to_atmel_nand(chip);

	struct atmel_hsmc_nand_controller *nc;



	nc = to_hsmc_nand_controller(chip->controller);



	atmel_nand_select_chip(mtd, cs);

	atmel_nand_select_chip(chip, cs);



	if (!nand->activecs) {

		regmap_write(nc->base.smc, ATMEL_HSMC_NFC_CTRL,

drivers/mtd/nand/raw/au1550nd.c

+2 −2
Original line number Diff line number Diff line
@@ -227,10 +227,10 @@ int au1550_device_ready(struct mtd_info *mtd) 
 *	chip needs it to be asserted during chip not ready time but the NAND

 *	controller keeps it released.

 *

 * @mtd:	MTD device structure

 * @this:	NAND chip object

 * @chip:	chipnumber to select, -1 for deselect

 */

static void au1550_select_chip(struct mtd_info *mtd, int chip)

static void au1550_select_chip(struct nand_chip *this, int chip)

{

}

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

+2 −2
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ static void bcm47xxnflash_ops_bcm4706_cmd_ctrl(struct mtd_info *mtd, int cmd, 
}



/* Default nand_select_chip calls cmd_ctrl, which is not used in BCM4706 */

static void bcm47xxnflash_ops_bcm4706_select_chip(struct mtd_info *mtd,

						  int chip)

static void bcm47xxnflash_ops_bcm4706_select_chip(struct nand_chip *chip,

						  int cs)

{

	return;

}

drivers/mtd/nand/raw/cafe_nand.c

+1 −2
Original line number Diff line number Diff line
@@ -314,9 +314,8 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command, 
	cafe_writel(cafe, cafe->ctl2, NAND_CTRL2);

}



static void cafe_select_chip(struct mtd_info *mtd, int chipnr)

static void cafe_select_chip(struct nand_chip *chip, int chipnr)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct cafe_priv *cafe = nand_get_controller_data(chip);



	cafe_dev_dbg(&cafe->pdev->dev, "select_chip %d\n", chipnr);

drivers/mtd/nand/raw/davinci_nand.c

+2 −2
Original line number Diff line number Diff line
@@ -118,9 +118,9 @@ static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, 
		iowrite8(cmd, nand->IO_ADDR_W);

}



static void nand_davinci_select_chip(struct mtd_info *mtd, int chip)

static void nand_davinci_select_chip(struct nand_chip *nand, int chip)

{

	struct davinci_nand_info	*info = to_davinci_nand(mtd);

	struct davinci_nand_info *info = to_davinci_nand(nand_to_mtd(nand));



	info->current_cs = info->vaddr;