Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze

[u-boot] / drivers / mtd / nand / mxs_nand.c

diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
index 036c113ad3e93ad6ffaa8a637d6e042fe2758a94..7a064ab1bf945a2e5724ce9a9bf4e6ad403e1c81 100644 (file)
--- a/drivers/mtd/nand/mxs_nand.c
+++ b/drivers/mtd/nand/mxs_nand.c
@@ -146,8 +146,13 @@ static uint32_t mxs_nand_aux_status_offset(void)
 static inline uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size,
                                                uint32_t page_oob_size)
 {
-       if (page_data_size == 2048)
-               return 8;
+       if (page_data_size == 2048) {
+               if (page_oob_size == 64)
+                       return 8;
+
+               if (page_oob_size == 112)
+                       return 14;
+       }
 
        if (page_data_size == 4096) {
                if (page_oob_size == 128)