Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 8ca417614c5751f12354cff4b11a7aa94aaa4fcf..588e98930aac65cde559808eeba1bab57e94557a 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -406,53 +406,35 @@ config MTD_NAND_ATMEL
        help
          Enables support for NAND Flash / Smart Media Card interface
          on Atmel AT91 and AVR32 processors.
-choice
-       prompt "ECC management for NAND Flash / SmartMedia on AT91 / AVR32"
-       depends on MTD_NAND_ATMEL
 
-config MTD_NAND_ATMEL_ECC_HW
-       bool "Hardware ECC"
-       depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9260 || AVR32
+config MTD_NAND_PXA3xx
+       tristate "Support for NAND flash devices on PXA3xx"
+       depends on PXA3xx || ARCH_MMP
        help
-         Use hardware ECC instead of software ECC when the chip
-         supports it.
-
-         The hardware ECC controller is capable of single bit error
-         correction and 2-bit random detection per page.
-
-         NB : hardware and software ECC schemes are incompatible.
-         If you switch from one to another, you'll have to erase your
-         mtd partition.
-
-         If unsure, say Y
+         This enables the driver for the NAND flash device found on
+         PXA3xx processors
 
-config MTD_NAND_ATMEL_ECC_SOFT
-       bool "Software ECC"
+config MTD_NAND_SLC_LPC32XX
+       tristate "NXP LPC32xx SLC Controller"
+       depends on ARCH_LPC32XX
        help
-         Use software ECC.
+         Enables support for NXP's LPC32XX SLC (i.e. for Single Level Cell
+         chips) NAND controller. This is the default for the PHYTEC 3250
+         reference board which contains a NAND256R3A2CZA6 chip.
 
-         NB : hardware and software ECC schemes are incompatible.
-         If you switch from one to another, you'll have to erase your
-         mtd partition.
+         Please check the actual NAND chip connected and its support
+         by the SLC NAND controller.
 
-config MTD_NAND_ATMEL_ECC_NONE
-       bool "No ECC (testing only, DANGEROUS)"
-       depends on DEBUG_KERNEL
+config MTD_NAND_MLC_LPC32XX
+       tristate "NXP LPC32xx MLC Controller"
+       depends on ARCH_LPC32XX
        help
-         No ECC will be used.
-         It's not a good idea and it should be reserved for testing
-         purpose only.
+         Uses the LPC32XX MLC (i.e. for Multi Level Cell chips) NAND
+         controller. This is the default for the WORK92105 controller
+         board.
 
-         If unsure, say N
-
-endchoice
-
-config MTD_NAND_PXA3xx
-       tristate "Support for NAND flash devices on PXA3xx"
-       depends on PXA3xx || ARCH_MMP
-       help
-         This enables the driver for the NAND flash device found on
-         PXA3xx processors
+         Please check the actual NAND chip connected and its support
+         by the MLC NAND controller.
 
 config MTD_NAND_CM_X270
        tristate "Support for NAND Flash on CM-X270 modules"
@@ -550,7 +532,7 @@ config MTD_NAND_MPC5121_NFC
 
 config MTD_NAND_MXC
        tristate "MXC NAND support"
-       depends on IMX_HAVE_PLATFORM_MXC_NAND
+       depends on ARCH_MXC
        help
          This enables the driver for the NAND flash controller on the
          MXC processors.