Merge git://git.infradead.org/~dwmw2/cafe-2.6

[linux-2.6] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index c2cb87fc4cb878f99a6c8665da53292c02d98fe7..564f79d166567f2c6326dbe36dddae702ab866dd 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -11,7 +11,7 @@ config MTD_NAND
        help
          This enables support for accessing all type of NAND flash
          devices. For further information see
        help
          This enables support for accessing all type of NAND flash
          devices. For further information see

-         <http://www.linux-mtd.infradead.org/tech/nand.html>.
+         <http://www.linux-mtd.infradead.org/doc/nand.html>.

 
 config MTD_NAND_VERIFY_WRITE
        bool "Verify NAND page writes"
 
 config MTD_NAND_VERIFY_WRITE
        bool "Verify NAND page writes"


@@ -21,7 +21,7 @@ config MTD_NAND_VERIFY_WRITE
          NAND flash device internally checks only bits transitioning
          from 1 to 0. There is a rare possibility that even though the
          device thinks the write was successful, a bit could have been
          NAND flash device internally checks only bits transitioning
          from 1 to 0. There is a rare possibility that even though the
          device thinks the write was successful, a bit could have been

-         flipped accidentaly due to device wear or something else.
+         flipped accidentally due to device wear or something else.

 
 config MTD_NAND_ECC_SMC
        bool "NAND ECC Smart Media byte order"
 
 config MTD_NAND_ECC_SMC
        bool "NAND ECC Smart Media byte order"


@@ -65,7 +65,7 @@ config MTD_NAND_AMS_DELTA
 
 config MTD_NAND_TOTO
        tristate "NAND Flash device on TOTO board"
 
 config MTD_NAND_TOTO
        tristate "NAND Flash device on TOTO board"

-       depends on ARCH_OMAP && MTD_NAND
+       depends on ARCH_OMAP && MTD_NAND && BROKEN

        help
          Support for NAND flash on Texas Instruments Toto platform.
 
        help
          Support for NAND flash on Texas Instruments Toto platform.
 


@@ -96,7 +96,7 @@ config MTD_NAND_RTC_FROM4
 
 config MTD_NAND_PPCHAMELEONEVB
        tristate "NAND Flash device on PPChameleonEVB board"
 
 config MTD_NAND_PPCHAMELEONEVB
        tristate "NAND Flash device on PPChameleonEVB board"

-       depends on PPCHAMELEONEVB && MTD_NAND
+       depends on PPCHAMELEONEVB && MTD_NAND && BROKEN

        help
          This enables the NAND flash driver on the PPChameleon EVB Board.
 
        help
          This enables the NAND flash driver on the PPChameleon EVB Board.
 


@@ -135,6 +135,16 @@ config MTD_NAND_NDFC
        help
         NDFC Nand Flash Controllers are integrated in EP44x SoCs
 
        help
         NDFC Nand Flash Controllers are integrated in EP44x SoCs
 

+config MTD_NAND_S3C2410_CLKSTOP
+       bool "S3C2410 NAND IDLE clock stop"
+       depends on MTD_NAND_S3C2410
+       default n
+       help
+         Stop the clock to the NAND controller when there is no chip
+         selected to save power. This will mean there is a small delay
+         when the is NAND chip selected or released, but will save
+         approximately 5mA of power when there is nothing happening.
+

 config MTD_NAND_DISKONCHIP
        tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
        depends on MTD_NAND && EXPERIMENTAL
 config MTD_NAND_DISKONCHIP
        tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
        depends on MTD_NAND && EXPERIMENTAL


@@ -209,9 +219,16 @@ config MTD_NAND_SHARPSL
        tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
        depends on MTD_NAND && ARCH_PXA
 
        tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
        depends on MTD_NAND && ARCH_PXA
 

+config MTD_NAND_CAFE
+       tristate "NAND support for OLPC CAFÉ chip"
+       depends on PCI
+       help
+        Use NAND flash attached to the CAFÉ chip designed for the $100
+        laptop.
+

 config MTD_NAND_CS553X
        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
 config MTD_NAND_CS553X
        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"

-       depends on MTD_NAND && X86_PC && PCI
+       depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH)

        help
          The CS553x companion chips for the AMD Geode processor
          include NAND flash controllers with built-in hardware ECC
        help
          The CS553x companion chips for the AMD Geode processor
          include NAND flash controllers with built-in hardware ECC


@@ -222,6 +239,13 @@ config MTD_NAND_CS553X
 
          If you say "m", the module will be called "cs553x_nand.ko".
 
 
          If you say "m", the module will be called "cs553x_nand.ko".
 

+config MTD_NAND_AT91
+       bool "Support for NAND Flash / SmartMedia on AT91"
+       depends on MTD_NAND && ARCH_AT91
+       help
+         Enables support for NAND Flash / Smart Media Card interface
+         on Atmel AT91 processors.
+

 config MTD_NAND_NANDSIM
        tristate "Support for NAND Flash Simulator"
        depends on MTD_NAND && MTD_PARTITIONS
 config MTD_NAND_NANDSIM
        tristate "Support for NAND Flash Simulator"
        depends on MTD_NAND && MTD_PARTITIONS