Skip to content

Commit ce10771

Browse files
Tony O'Brienmiquelraynal
authored andcommitted
mtd: rawnand: marvell: Use correct logic for nand-keep-config
Originally the absence of the marvell,nand-keep-config property caused the setup_data_interface function to be provided. However when setup_data_interface was moved into nand_controller_ops the logic was unintentionally inverted. Update the logic so that only if the marvell,nand-keep-config property is present the bootloader NAND config kept. Cc: stable@vger.kernel.org Fixes: 7a08dba ("mtd: rawnand: Move ->setup_data_interface() to nand_controller_ops") Signed-off-by: Tony O'Brien <tony.obrien@alliedtelesis.co.nz> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20220927024728.28447-1-chris.packham@alliedtelesis.co.nz
1 parent 3ada713 commit ce10771

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/mtd/nand/raw/marvell_nand.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2678,7 +2678,7 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc,
26782678
chip->controller = &nfc->controller;
26792679
nand_set_flash_node(chip, np);
26802680

2681-
if (!of_property_read_bool(np, "marvell,nand-keep-config"))
2681+
if (of_property_read_bool(np, "marvell,nand-keep-config"))
26822682
chip->options |= NAND_KEEP_TIMINGS;
26832683

26842684
mtd = nand_to_mtd(chip);

0 commit comments

Comments
 (0)