Skip to content

Commit 249a959

Browse files
committed
mtd: rawnand: ams-delta: Do not force a particular software ECC engine
Originally, commit d7157ff ("mtd: rawnand: Use the ECC framework user input parsing bits") kind of broke the logic around the initialization of several ECC engines. Unfortunately, the fix (which indeed moved the ECC initialization to the right place) did not take into account the fact that a different ECC algorithm could have been used thanks to a DT property, considering the "Hamming" algorithm entry a configuration while it was only a default. Add the necessary logic to be sure Hamming keeps being only a default. Fixes: 59d9347 ("mtd: rawnand: ams-delta: Move the ECC initialization to ->attach_chip()") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20201203190340.15522-2-miquel.raynal@bootlin.com
1 parent b650545 commit 249a959

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ static int gpio_nand_setup_interface(struct nand_chip *this, int csline,
218218
static int gpio_nand_attach_chip(struct nand_chip *chip)
219219
{
220220
chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
221-
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
221+
222+
if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
223+
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
222224

223225
return 0;
224226
}

0 commit comments

Comments
 (0)