mtd: rawnand: socrates: Do not force a particular software ECC engine

Originally, commit d7157ff49a5b ("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.

Miquel Raynal committed 5 years ago

Commit cf75f001 parent 148b4f11 file · +3 −1Browse files

Unified · Split

drivers/mtd/nand/raw/socrates_nand.c+3−1

@@ -120,7 +120,9 @@ static int socrates_nand_device_ready(struct nand_chip *nand_chip) · 119 unmodified lines
120	120	static int socrates_attach_chip(struct nand_chip *chip)
121	121	{
122	122	chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
123		− chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
	123	+
	124	+ if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
	125	+ chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
124	126
125	127	return 0;
126	128	}