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

Commit 61528d88 authored by Marek Vasut's avatar Marek Vasut Committed by Brian Norris
Browse files

mtd: nand: Rename nand_chip .dn to .flash_node 



Use a more descriptive name for the device_node element in struct nand_chip .
This name matches the element name used for device_node property of a flash
in the spi-nor framework.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 11bff0b7

drivers/mtd/nand/brcmnand/brcmnand.c

+3 −2
Original line number Diff line number Diff line
@@ -1792,7 +1792,8 @@ static int brcmnand_setup_dev(struct brcmnand_host *host) 


	memset(cfg, 0, sizeof(*cfg));



	ret = of_property_read_u32(chip->dn, "brcm,nand-oob-sector-size",

	ret = of_property_read_u32(chip->flash_node,

				   "brcm,nand-oob-sector-size",

				   &oob_sector);

	if (ret) {

		/* Use detected size */
@@ -1899,7 +1900,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host) 
	mtd = &host->mtd;

	chip = &host->chip;



	chip->dn = dn;

	chip->flash_node = dn;

	chip->priv = host;

	mtd->priv = chip;

	mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",

drivers/mtd/nand/nand_base.c

+2 −2
Original line number Diff line number Diff line
@@ -3846,8 +3846,8 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips, 
	struct nand_flash_dev *type;

	int ret;



	if (chip->dn) {

		ret = nand_dt_init(mtd, chip, chip->dn);

	if (chip->flash_node) {

		ret = nand_dt_init(mtd, chip, chip->flash_node);

		if (ret)

			return ret;

	}

include/linux/mtd/nand.h

+2 −2
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ struct nand_buffers { 
 *			flash device

 * @IO_ADDR_W:		[BOARDSPECIFIC] address to write the 8 I/O lines of the

 *			flash device.

 * @dn:			[BOARDSPECIFIC] device node describing this instance

 * @flash_node:		[BOARDSPECIFIC] device node describing this instance

 * @read_byte:		[REPLACEABLE] read one byte from the chip

 * @read_word:		[REPLACEABLE] read one word from the chip

 * @write_byte:		[REPLACEABLE] write a single byte to the chip on the
@@ -647,7 +647,7 @@ struct nand_chip { 
	void __iomem *IO_ADDR_R;

	void __iomem *IO_ADDR_W;



	struct device_node *dn;

	struct device_node *flash_node;



	uint8_t (*read_byte)(struct mtd_info *mtd);

	u16 (*read_word)(struct mtd_info *mtd);