Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[platform/kernel/linux-rpi.git] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index d885298..93ae6a6 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -96,43 +96,15 @@ config MTD_NAND_OMAP2
 
 config MTD_NAND_OMAP_BCH
        depends on MTD_NAND && MTD_NAND_OMAP2 && ARCH_OMAP3
-       tristate "Enable support for hardware BCH error correction"
+       tristate "Support hardware based BCH error correction"
        default n
        select BCH
-       select BCH_CONST_PARAMS
        help
-        Support for hardware BCH error correction.
-
-choice
-       prompt "BCH error correction capability"
-       depends on MTD_NAND_OMAP_BCH
-
-config MTD_NAND_OMAP_BCH8
-       bool "8 bits / 512 bytes (recommended)"
-       help
-        Support correcting up to 8 bitflips per 512-byte block.
-        This will use 13 bytes of spare area per 512 bytes of page data.
-        This is the recommended mode, as 4-bit mode does not work
-        on some OMAP3 revisions, due to a hardware bug.
-
-config MTD_NAND_OMAP_BCH4
-       bool "4 bits / 512 bytes"
-       help
-        Support correcting up to 4 bitflips per 512-byte block.
-        This will use 7 bytes of spare area per 512 bytes of page data.
-        Note that this mode does not work on some OMAP3 revisions, due to a
-        hardware bug. Please check your OMAP datasheet before selecting this
-        mode.
-
-endchoice
-
-if MTD_NAND_OMAP_BCH
-config BCH_CONST_M
-       default 13
-config BCH_CONST_T
-       default 4 if MTD_NAND_OMAP_BCH4
-       default 8 if MTD_NAND_OMAP_BCH8
-endif
+         This config enables the ELM hardware engine, which can be used to
+         locate and correct errors when using BCH ECC scheme. This offloads
+         the cpu from doing ECC error searching and correction. However some
+         legacy OMAP families like OMAP2xxx, OMAP3xxx do not have ELM engine
+         so they should not enable this config symbol.
 
 config MTD_NAND_IDS
        tristate