colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'u-boot-nand-20230422' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash

Browse Source 
Pull request for u-boot-nand-20230422

Replaces a patch by Linus Walleij merged with pull request
u-boot-nand-20230417, with a newer version that contains fixes for tests
run by Tom Rini.
This commit is contained in:
Tom Rini
2023-04-22 18:30:31 -04:00
parent 454712f67c 770e77051e
commit 03972a10ac
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/mtd/nand/raw/nand_base.c
View File

@@ -4514,12 +4514,21 @@ static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode nod
} }
str = ofnode_read_string(node, "nand-ecc-algo"); str = ofnode_read_string(node, "nand-ecc-algo");
if (str && !strcmp(str, "bch")) { if (str) {
ecc_algo = NAND_ECC_BCH; /*
if (ecc_mode == NAND_ECC_SOFT) * If we are in NAND_ECC_SOFT mode, just alter the
ecc_mode = NAND_ECC_SOFT_BCH; * soft mode to BCH here. No change of algorithm.
} else if (!strcmp(str, "hamming")) { */
ecc_algo = NAND_ECC_HAMMING; if (ecc_mode == NAND_ECC_SOFT) {
if (!strcmp(str, "bch"))
ecc_mode = NAND_ECC_SOFT_BCH;
} else {
if (!strcmp(str, "bch")) {
ecc_algo = NAND_ECC_BCH;
} else if (!strcmp(str, "hamming")) {
ecc_algo = NAND_ECC_HAMMING;
}
}
} }
ecc_strength = ofnode_read_s32_default(node, ecc_strength = ofnode_read_s32_default(node,
@@ -4533,7 +4542,13 @@ static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode nod
return -EINVAL; return -EINVAL;
} }
chip->ecc.algo = ecc_algo; /*
* Chip drivers may have assigned default algorithms here,
* onlt override it if we have found something explicitly
* specified in the device tree.
*/
if (ecc_algo != NAND_ECC_UNKNOWN)
chip->ecc.algo = ecc_algo;
if (ecc_mode >= 0) if (ecc_mode >= 0)
chip->ecc.mode = ecc_mode; chip->ecc.mode = ecc_mode;