Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd

[linux-beck.git] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index dae191b3c081861a52f4a75adea4dba3ded0c0a1..5819eb575210115bf0e25d28bde1298afc2f6995 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -50,16 +50,30 @@ config MTD_NAND_MUSEUM_IDS
          of these chips were reused by later, larger chips.
 
 config MTD_NAND_DENALI
          of these chips were reused by later, larger chips.
 
 config MTD_NAND_DENALI

-       depends on PCI
+        tristate "Support Denali NAND controller"
+        help
+         Enable support for the Denali NAND controller.  This should be
+         combined with either the PCI or platform drivers to provide device
+         registration.
+
+config MTD_NAND_DENALI_PCI

         tristate "Support Denali NAND controller on Intel Moorestown"
         tristate "Support Denali NAND controller on Intel Moorestown"

+       depends on PCI && MTD_NAND_DENALI

         help
           Enable the driver for NAND flash on Intel Moorestown, using the
           Denali NAND controller core.
         help
           Enable the driver for NAND flash on Intel Moorestown, using the
           Denali NAND controller core.

- 
+
+config MTD_NAND_DENALI_DT
+       tristate "Support Denali NAND controller as a DT device"
+       depends on HAVE_CLK && MTD_NAND_DENALI
+       help
+         Enable the driver for NAND flash on platforms using a Denali NAND
+         controller as a DT device.
+

 config MTD_NAND_DENALI_SCRATCH_REG_ADDR
         hex "Denali NAND size scratch register address"
         default "0xFF108018"
 config MTD_NAND_DENALI_SCRATCH_REG_ADDR
         hex "Denali NAND size scratch register address"
         default "0xFF108018"

-        depends on MTD_NAND_DENALI
+        depends on MTD_NAND_DENALI_PCI

         help
           Some platforms place the NAND chip size in a scratch register
           because (some versions of) the driver aren't able to automatically
         help
           Some platforms place the NAND chip size in a scratch register
           because (some versions of) the driver aren't able to automatically


@@ -433,6 +447,14 @@ config MTD_NAND_GPMI_NAND
         block, such as SD card. So pay attention to it when you enable
         the GPMI.
 
         block, such as SD card. So pay attention to it when you enable
         the GPMI.
 

+config MTD_NAND_BCM47XXNFLASH
+       tristate "Support for NAND flash on BCM4706 BCMA bus"
+       depends on BCMA_NFLASH
+       help
+         BCMA bus can have various flash memories attached, they are
+         registered by bcma as platform devices. This enables driver for
+         NAND flash memories. For now only BCM4706 is supported.
+

 config MTD_NAND_PLATFORM
        tristate "Support for generic platform NAND driver"
        depends on HAS_IOMEM
 config MTD_NAND_PLATFORM
        tristate "Support for generic platform NAND driver"
        depends on HAS_IOMEM


@@ -499,12 +521,6 @@ config MTD_NAND_MXC
          This enables the driver for the NAND flash controller on the
          MXC processors.
 
          This enables the driver for the NAND flash controller on the
          MXC processors.
 

-config MTD_NAND_NOMADIK
-       tristate "ST Nomadik 8815 NAND support"
-       depends on ARCH_NOMADIK
-       help
-         Driver for the NAND flash controller on the Nomadik, with ECC.
-

 config MTD_NAND_SH_FLCTL
        tristate "Support for NAND on Renesas SuperH FLCTL"
        depends on SUPERH || ARCH_SHMOBILE
 config MTD_NAND_SH_FLCTL
        tristate "Support for NAND on Renesas SuperH FLCTL"
        depends on SUPERH || ARCH_SHMOBILE