3 files changed, 10 insertions, 1 deletions

diff --git a/include/linux/platform_data/elm.h b/include/linux/platform_data/elm.h
index 4edb40676b3f..780d1e97f620 100644
--- a/include/linux/platform_data/elm.h
+++ b/include/linux/platform_data/elm.h
@@ -21,6 +21,7 @@
 enum bch_ecc {
         BCH4_ECC = 0,
         BCH8_ECC,
+        BCH16_ECC,
 };
 
 /* ELM support 8 error syndrome process */
@@ -38,7 +39,7 @@ struct elm_errorvec {
         bool error_reported;
         bool error_uncorrectable;
         int error_count;
-        int error_loc[ERROR_VECTOR_MAX];
+        int error_loc[16];
 };
 
 void elm_decode_bch_error_page(struct device *dev, u8 *ecc_calc,
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
index 3e9dd6676b97..660c029d694f 100644
--- a/include/linux/platform_data/mtd-nand-omap2.h
+++ b/include/linux/platform_data/mtd-nand-omap2.h
@@ -31,6 +31,8 @@ enum omap_ecc {
         OMAP_ECC_BCH8_CODE_HW_DETECTION_SW,
         /* 8-bit  ECC calculation by GPMC, Error detection by ELM */
         OMAP_ECC_BCH8_CODE_HW,
+        /* 16-bit ECC calculation by GPMC, Error detection by ELM */
+        OMAP_ECC_BCH16_CODE_HW,
 };
 
 struct gpmc_nand_regs {
@@ -50,6 +52,9 @@ struct gpmc_nand_regs {
         void __iomem    *gpmc_bch_result1[GPMC_BCH_NUM_REMAINDER];
         void __iomem    *gpmc_bch_result2[GPMC_BCH_NUM_REMAINDER];
         void __iomem    *gpmc_bch_result3[GPMC_BCH_NUM_REMAINDER];
+        void __iomem    *gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER];
+        void __iomem    *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER];
+        void __iomem    *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER];
 };
 
 struct omap_nand_platform_data {
diff --git a/include/linux/platform_data/mtd-nand-pxa3xx.h b/include/linux/platform_data/mtd-nand-pxa3xx.h
index a94147124929..ac4ea2e641c7 100644
--- a/include/linux/platform_data/mtd-nand-pxa3xx.h
+++ b/include/linux/platform_data/mtd-nand-pxa3xx.h
@@ -58,6 +58,9 @@ struct pxa3xx_nand_platform_data {
         /* use an flash-based bad block table */
         bool    flash_bbt;
 
+        /* requested ECC strength and ECC step size */
+        int ecc_strength, ecc_step_size;
+
         const struct mtd_partition              *parts[NUM_CHIP_SELECT];
         unsigned int                            nr_parts[NUM_CHIP_SELECT];