65 files changed, 925 insertions, 984 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-mtd b/Documentation/ABI/testing/sysfs-class-mtd
index bfd119ace6ad..1399bb2da3eb 100644
--- a/Documentation/ABI/testing/sysfs-class-mtd
+++ b/Documentation/ABI/testing/sysfs-class-mtd
@@ -104,7 +104,7 @@ Description:
                 One of the following ASCII strings, representing the device
                 type:
 
-                absent, ram, rom, nor, nand, dataflash, ubi, unknown
+                absent, ram, rom, nor, nand, mlc-nand, dataflash, ubi, unknown
 
 What:           /sys/class/mtd/mtdX/writesize
 Date:           April 2009
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl
index a248f42a121e..cd11926e07c7 100644
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
@@ -1222,8 +1222,6 @@ in this page</entry>
 #define NAND_BBT_VERSION        0x00000100
 /* Create a bbt if none axists */
 #define NAND_BBT_CREATE         0x00000200
-/* Search good / bad pattern through all pages of a block */
-#define NAND_BBT_SCANALLPAGES   0x00000400
 /* Write bbt if neccecary */
 #define NAND_BBT_WRITE          0x00001000
 /* Read and write back block contents when writing bbt */
diff --git a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
index df338cb5059c..5e1f31b5ff70 100644
--- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
@@ -22,10 +22,10 @@ Optional properties:
                                 width of 8 is assumed.
 
  - ti,nand-ecc-opt:             A string setting the ECC layout to use. One of:
-
-                "sw"            Software method (default)
-                "hw"            Hardware method
-                "hw-romcode"    gpmc hamming mode method & romcode layout
+                "sw"            <deprecated> use "ham1" instead
+                "hw"            <deprecated> use "ham1" instead
+                "hw-romcode"    <deprecated> use "ham1" instead
+                "ham1"          1-bit Hamming ecc code
                 "bch4"          4-bit BCH ecc code
                 "bch8"          8-bit BCH ecc code
 
@@ -36,8 +36,12 @@ Optional properties:
                 "prefetch-dma"          Prefetch enabled sDMA mode
                 "prefetch-irq"          Prefetch enabled irq mode
 
- - elm_id:      Specifies elm device node. This is required to support BCH
-                error correction using ELM module.
+ - elm_id:      <deprecated> use "ti,elm-id" instead
+ - ti,elm-id:   Specifies phandle of the ELM devicetree node.
+                ELM is an on-chip hardware engine on TI SoC which is used for
+                locating ECC errors for BCHx algorithms. SoC devices which have
+                ELM hardware engines should specify this device node in .dtsi
+                Using ELM for ECC error correction frees some CPU cycles.
 
 For inline partiton table parsing (optional):
 
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c
index fc20a61f6b2a..ac82512b9c8c 100644
--- a/arch/arm/mach-omap2/board-flash.c
+++ b/arch/arm/mach-omap2/board-flash.c
@@ -142,7 +142,7 @@ __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs,
         board_nand_data.nr_parts        = nr_parts;
         board_nand_data.devsize         = nand_type;
 
-        board_nand_data.ecc_opt = OMAP_ECC_HAMMING_CODE_DEFAULT;
+        board_nand_data.ecc_opt = OMAP_ECC_BCH8_CODE_HW;
         gpmc_nand_init(&board_nand_data, gpmc_t);
 }
 #endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 51525faa0aec..81de56251955 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -1341,14 +1341,6 @@ static void __maybe_unused gpmc_read_timings_dt(struct device_node *np,
 
 #ifdef CONFIG_MTD_NAND