aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-04-17 16:53:00 -0400
committerBoris Brezillon <boris.brezillon@free-electrons.com>2016-05-05 17:52:03 -0400
commit40438a1ea7fb8326daffa692dbf41a5c60bbf3da (patch)
treea88f7a5618a6eb8c770f1567529caba682e2d751
parentd5f304ac6aff1462ddf3c14f48e2b849ab68d5a3 (diff)
CRIS v32: nand: set ECC algorithm explicitly
This is part of process deprecating NAND_ECC_SOFT_BCH (and switching to enum nand_ecc_algo). Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Acked-by: Mikael Starvik <starvik@axis.com> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-rw-r--r--arch/cris/arch-v32/drivers/mach-a3/nandflash.c1
-rw-r--r--arch/cris/arch-v32/drivers/mach-fs/nandflash.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index 5aa3f5162310..3f646c787e58 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@ -157,6 +157,7 @@ struct mtd_info *__init crisv32_nand_flash_probe(void)
157 /* 20 us command delay time */ 157 /* 20 us command delay time */
158 this->chip_delay = 20; 158 this->chip_delay = 20;
159 this->ecc.mode = NAND_ECC_SOFT; 159 this->ecc.mode = NAND_ECC_SOFT;
160 this->ecc.algo = NAND_ECC_HAMMING;
160 161
161 /* Enable the following for a flash based bad block table */ 162 /* Enable the following for a flash based bad block table */
162 /* this->bbt_options = NAND_BBT_USE_FLASH; */ 163 /* this->bbt_options = NAND_BBT_USE_FLASH; */
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index a7c17b0f172a..a74540514bdb 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -148,6 +148,7 @@ struct mtd_info *__init crisv32_nand_flash_probe(void)
148 /* 20 us command delay time */ 148 /* 20 us command delay time */
149 this->chip_delay = 20; 149 this->chip_delay = 20;
150 this->ecc.mode = NAND_ECC_SOFT; 150 this->ecc.mode = NAND_ECC_SOFT;
151 this->ecc.algo = NAND_ECC_HAMMING;
151 152
152 /* Enable the following for a flash based bad block table */ 153 /* Enable the following for a flash based bad block table */
153 /* this->bbt_options = NAND_BBT_USE_FLASH; */ 154 /* this->bbt_options = NAND_BBT_USE_FLASH; */