Merge branch 'omap-for-v4.8/legacy' into for-next

[deliverable/linux.git] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index f05e0e9eb2f73e8b807d97fb30cf4638d07286d9..21ff58099f3bfd5c042040d2ee7e4bbcbdb6a074 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -438,7 +438,7 @@ config MTD_NAND_FSL_ELBC
 
 config MTD_NAND_FSL_IFC
        tristate "NAND support for Freescale IFC controller"
 
 config MTD_NAND_FSL_IFC
        tristate "NAND support for Freescale IFC controller"

-       depends on MTD_NAND && FSL_SOC
+       depends on MTD_NAND && (FSL_SOC || ARCH_LAYERSCAPE)

        select FSL_IFC
        select MEMORY
        help
        select FSL_IFC
        select MEMORY
        help


@@ -539,7 +539,6 @@ config MTD_NAND_FSMC
 config MTD_NAND_XWAY
        tristate "Support for NAND on Lantiq XWAY SoC"
        depends on LANTIQ && SOC_TYPE_XWAY
 config MTD_NAND_XWAY
        tristate "Support for NAND on Lantiq XWAY SoC"
        depends on LANTIQ && SOC_TYPE_XWAY

-       select MTD_NAND_PLATFORM

        help
          Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
          to the External Bus Unit (EBU).
        help
          Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
          to the External Bus Unit (EBU).


@@ -563,4 +562,11 @@ config MTD_NAND_QCOM
          Enables support for NAND flash chips on SoCs containing the EBI2 NAND
          controller. This controller is found on IPQ806x SoC.
 
          Enables support for NAND flash chips on SoCs containing the EBI2 NAND
          controller. This controller is found on IPQ806x SoC.
 

+config MTD_NAND_MTK
+       tristate "Support for NAND controller on MTK SoCs"
+       depends on HAS_DMA
+       help
+         Enables support for NAND controller on MTK SoCs.
+         This controller is found on mt27xx, mt81xx, mt65xx SoCs.
+

 endif # MTD_NAND
 endif # MTD_NAND