diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-06-27 15:04:20 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 13:17:51 -0400 |
commit | 0acf944c6853813ed19cdf46d4042a77dd878ab5 (patch) | |
tree | 474410fe0d44276df12ac4d880968ae662f055c2 /drivers/mtd | |
parent | ec6e0ea3bdf82ee9761d324c011c3627821f7410 (diff) |
[MTD] [NAND] fsl_elbc_nand: ecclayout cleanups
This patch deletes oobavail assignments, they're calculated by the nand
core code in nand_scan_tail, plus current oobavail values are wrong for
the LP NANDs.
Also remove mtd->ecclayout and mtd->oobavail assignments, mtd core
handles this all by itself.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/fsl_elbc_nand.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c index 5f1bc5ea2a73..d6d1ff55c4e5 100644 --- a/drivers/mtd/nand/fsl_elbc_nand.c +++ b/drivers/mtd/nand/fsl_elbc_nand.c | |||
@@ -89,7 +89,6 @@ static struct nand_ecclayout fsl_elbc_oob_sp_eccm0 = { | |||
89 | .eccbytes = 3, | 89 | .eccbytes = 3, |
90 | .eccpos = {6, 7, 8}, | 90 | .eccpos = {6, 7, 8}, |
91 | .oobfree = { {0, 5}, {9, 7} }, | 91 | .oobfree = { {0, 5}, {9, 7} }, |
92 | .oobavail = 12, | ||
93 | }; | 92 | }; |
94 | 93 | ||
95 | /* Small Page FLASH with FMR[ECCM] = 1 */ | 94 | /* Small Page FLASH with FMR[ECCM] = 1 */ |
@@ -97,7 +96,6 @@ static struct nand_ecclayout fsl_elbc_oob_sp_eccm1 = { | |||
97 | .eccbytes = 3, | 96 | .eccbytes = 3, |
98 | .eccpos = {8, 9, 10}, | 97 | .eccpos = {8, 9, 10}, |
99 | .oobfree = { {0, 5}, {6, 2}, {11, 5} }, | 98 | .oobfree = { {0, 5}, {6, 2}, {11, 5} }, |
100 | .oobavail = 12, | ||
101 | }; | 99 | }; |
102 | 100 | ||
103 | /* Large Page FLASH with FMR[ECCM] = 0 */ | 101 | /* Large Page FLASH with FMR[ECCM] = 0 */ |
@@ -105,7 +103,6 @@ static struct nand_ecclayout fsl_elbc_oob_lp_eccm0 = { | |||
105 | .eccbytes = 12, | 103 | .eccbytes = 12, |
106 | .eccpos = {6, 7, 8, 22, 23, 24, 38, 39, 40, 54, 55, 56}, | 104 | .eccpos = {6, 7, 8, 22, 23, 24, 38, 39, 40, 54, 55, 56}, |
107 | .oobfree = { {1, 5}, {9, 13}, {25, 13}, {41, 13}, {57, 7} }, | 105 | .oobfree = { {1, 5}, {9, 13}, {25, 13}, {41, 13}, {57, 7} }, |
108 | .oobavail = 48, | ||
109 | }; | 106 | }; |
110 | 107 | ||
111 | /* Large Page FLASH with FMR[ECCM] = 1 */ | 108 | /* Large Page FLASH with FMR[ECCM] = 1 */ |
@@ -113,7 +110,6 @@ static struct nand_ecclayout fsl_elbc_oob_lp_eccm1 = { | |||
113 | .eccbytes = 12, | 110 | .eccbytes = 12, |
114 | .eccpos = {8, 9, 10, 24, 25, 26, 40, 41, 42, 56, 57, 58}, | 111 | .eccpos = {8, 9, 10, 24, 25, 26, 40, 41, 42, 56, 57, 58}, |
115 | .oobfree = { {1, 7}, {11, 13}, {27, 13}, {43, 13}, {59, 5} }, | 112 | .oobfree = { {1, 7}, {11, 13}, {27, 13}, {43, 13}, {59, 5} }, |
116 | .oobavail = 48, | ||
117 | }; | 113 | }; |
118 | 114 | ||
119 | /* | 115 | /* |
@@ -730,8 +726,6 @@ static int fsl_elbc_chip_init_tail(struct mtd_info *mtd) | |||
730 | &fsl_elbc_oob_lp_eccm1 : | 726 | &fsl_elbc_oob_lp_eccm1 : |
731 | &fsl_elbc_oob_lp_eccm0; | 727 | &fsl_elbc_oob_lp_eccm0; |
732 | chip->badblock_pattern = &largepage_memorybased; | 728 | chip->badblock_pattern = &largepage_memorybased; |
733 | mtd->ecclayout = chip->ecc.layout; | ||
734 | mtd->oobavail = chip->ecc.layout->oobavail; | ||
735 | } | 729 | } |
736 | } else { | 730 | } else { |
737 | dev_err(ctrl->dev, | 731 | dev_err(ctrl->dev, |