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

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

mtd: rawnand: Deprecate the ->select_chip() hook 



Now that the CS line to be selected is passed to ->exec_op() and
stored in chip->cur_cs and after patching all drivers implementing
->exec_op() to stop implementing this method, we can deprecate it by
moving it to the nand_legacy structure.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Tested-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 1770022f

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

+2 −2
Original line number Diff line number Diff line
@@ -1477,7 +1477,7 @@ static void atmel_nand_init(struct atmel_nand_controller *nc, 
	chip->legacy.write_byte = atmel_nand_write_byte;

	chip->legacy.read_buf = atmel_nand_read_buf;

	chip->legacy.write_buf = atmel_nand_write_buf;

	chip->select_chip = atmel_nand_select_chip;

	chip->legacy.select_chip = atmel_nand_select_chip;



	if (nc->mck && nc->caps->ops->setup_data_interface)

		chip->setup_data_interface = atmel_nand_setup_data_interface;
@@ -1525,7 +1525,7 @@ static void atmel_hsmc_nand_init(struct atmel_nand_controller *nc, 


	/* Overload some methods for the HSMC controller. */

	chip->legacy.cmd_ctrl = atmel_hsmc_nand_cmd_ctrl;

	chip->select_chip = atmel_hsmc_nand_select_chip;

	chip->legacy.select_chip = atmel_hsmc_nand_select_chip;

}



static int atmel_nand_controller_remove_nand(struct atmel_nand *nand)

drivers/mtd/nand/raw/au1550nd.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int au1550nd_probe(struct platform_device *pdev) 
	ctx->cs = cs;



	this->legacy.dev_ready = au1550_device_ready;

	this->select_chip = au1550_select_chip;

	this->legacy.select_chip = au1550_select_chip;

	this->legacy.cmdfunc = au1550_command;



	/* 30 us command delay time */

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

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n) 
	u8 tbits, col_bits, col_size, row_bits, row_bsize;

	u32 val;



	b47n->nand_chip.select_chip = bcm47xxnflash_ops_bcm4706_select_chip;

	nand_chip->legacy.select_chip = bcm47xxnflash_ops_bcm4706_select_chip;

	nand_chip->legacy.cmd_ctrl = bcm47xxnflash_ops_bcm4706_cmd_ctrl;

	nand_chip->legacy.dev_ready = bcm47xxnflash_ops_bcm4706_dev_ready;

	b47n->nand_chip.legacy.cmdfunc = bcm47xxnflash_ops_bcm4706_cmdfunc;

drivers/mtd/nand/raw/cafe_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static int cafe_nand_probe(struct pci_dev *pdev, 
	cafe->nand.legacy.read_byte = cafe_read_byte;

	cafe->nand.legacy.read_buf = cafe_read_buf;

	cafe->nand.legacy.write_buf = cafe_write_buf;

	cafe->nand.select_chip = cafe_select_chip;

	cafe->nand.legacy.select_chip = cafe_select_chip;

	cafe->nand.legacy.set_features = nand_get_set_features_notsupp;

	cafe->nand.legacy.get_features = nand_get_set_features_notsupp;

drivers/mtd/nand/raw/davinci_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static int nand_davinci_probe(struct platform_device *pdev) 
	info->chip.legacy.IO_ADDR_R	= vaddr;

	info->chip.legacy.IO_ADDR_W	= vaddr;

	info->chip.legacy.chip_delay	= 0;

	info->chip.select_chip	= nand_davinci_select_chip;

	info->chip.legacy.select_chip	= nand_davinci_select_chip;



	/* options such as NAND_BBT_USE_FLASH */

	info->chip.bbt_options	= pdata->bbt_options;