Commit 9159c877 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

updated

parent 669ca34d
Loading
Loading
Loading
Loading
+60 −19
Original line number Original line Diff line number Diff line
@@ -49,23 +49,20 @@ config MTD_SM_COMMON
	default n
	default n


config MTD_NAND_DENALI
config MTD_NAND_DENALI
        tristate "Support Denali NAND controller"
	tristate
        depends on HAS_DMA
        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
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
	select MTD_NAND_DENALI
	depends on HAS_DMA && PCI
        help
        help
          Enable the driver for NAND flash on Intel Moorestown, using the
          Enable the driver for NAND flash on Intel Moorestown, using the
          Denali NAND controller core.
          Denali NAND controller core.


config MTD_NAND_DENALI_DT
config MTD_NAND_DENALI_DT
	tristate "Support Denali NAND controller as a DT device"
	tristate "Support Denali NAND controller as a DT device"
	depends on HAVE_CLK && MTD_NAND_DENALI
	select MTD_NAND_DENALI
	depends on HAS_DMA && HAVE_CLK && OF
	help
	help
	  Enable the driver for NAND flash on platforms using a Denali NAND
	  Enable the driver for NAND flash on platforms using a Denali NAND
	  controller as a DT device.
	  controller as a DT device.
@@ -83,7 +80,8 @@ config MTD_NAND_DENALI_SCRATCH_REG_ADDR


config MTD_NAND_GPIO
config MTD_NAND_GPIO
	tristate "GPIO assisted NAND Flash driver"
	tristate "GPIO assisted NAND Flash driver"
	depends on GPIOLIB
	depends on GPIOLIB || COMPILE_TEST
	depends on HAS_IOMEM
	help
	help
	  This enables a NAND flash driver where control signals are
	  This enables a NAND flash driver where control signals are
	  connected to GPIO pins, and commands and data are communicated
	  connected to GPIO pins, and commands and data are communicated
@@ -97,11 +95,11 @@ config MTD_NAND_AMS_DELTA
	  Support for NAND flash on Amstrad E3 (Delta).
	  Support for NAND flash on Amstrad E3 (Delta).


config MTD_NAND_OMAP2
config MTD_NAND_OMAP2
	tristate "NAND Flash device on OMAP2, OMAP3 and OMAP4"
	tristate "NAND Flash device on OMAP2, OMAP3, OMAP4 and Keystone"
	depends on ARCH_OMAP2PLUS
	depends on (ARCH_OMAP2PLUS || ARCH_KEYSTONE)
	help
	help
          Support for NAND flash on Texas Instruments OMAP2, OMAP3 and OMAP4
          Support for NAND flash on Texas Instruments OMAP2, OMAP3, OMAP4
	  platforms.
	  and Keystone platforms.


config MTD_NAND_OMAP_BCH
config MTD_NAND_OMAP_BCH
	depends on MTD_NAND_OMAP2
	depends on MTD_NAND_OMAP2
@@ -320,6 +318,7 @@ config MTD_NAND_CAFE
config MTD_NAND_CS553X
config MTD_NAND_CS553X
	tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
	tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
	depends on X86_32
	depends on X86_32
	depends on !UML && HAS_IOMEM
	help
	help
	  The CS553x companion chips for the AMD Geode processor
	  The CS553x companion chips for the AMD Geode processor
	  include NAND flash controllers with built-in hardware ECC
	  include NAND flash controllers with built-in hardware ECC
@@ -401,6 +400,14 @@ config MTD_NAND_GPMI_NAND
	 block, such as SD card. So pay attention to it when you enable
	 block, such as SD card. So pay attention to it when you enable
	 the GPMI.
	 the GPMI.


config MTD_NAND_BRCMNAND
	tristate "Broadcom STB NAND controller"
	depends on ARM || ARM64 || MIPS
	help
	  Enables the Broadcom NAND controller driver. The controller was
	  originally designed for Set-Top Box but is used on various BCM7xxx,
	  BCM3xxx, BCM63xxx, iProc/Cygnus and more.

config MTD_NAND_BCM47XXNFLASH
config MTD_NAND_BCM47XXNFLASH
	tristate "Support for NAND flash on BCM4706 BCMA bus"
	tristate "Support for NAND flash on BCM4706 BCMA bus"
	depends on BCMA_NFLASH
	depends on BCMA_NFLASH
@@ -428,7 +435,7 @@ config MTD_NAND_ORION


config MTD_NAND_FSL_ELBC
config MTD_NAND_FSL_ELBC
	tristate "NAND support for Freescale eLBC controllers"
	tristate "NAND support for Freescale eLBC controllers"
	depends on PPC
	depends on FSL_SOC
	select FSL_LBC
	select FSL_LBC
	help
	help
	  Various Freescale chips, including the 8313, include a NAND Flash
	  Various Freescale chips, including the 8313, include a NAND Flash
@@ -438,7 +445,7 @@ config MTD_NAND_FSL_ELBC


config MTD_NAND_FSL_IFC
config MTD_NAND_FSL_IFC
	tristate "NAND support for Freescale IFC controller"
	tristate "NAND support for Freescale IFC controller"
	depends on MTD_NAND && FSL_SOC
	depends on FSL_SOC || ARCH_LAYERSCAPE
	select FSL_IFC
	select FSL_IFC
	select MEMORY
	select MEMORY
	help
	help
@@ -462,6 +469,18 @@ config MTD_NAND_MPC5121_NFC
	  This enables the driver for the NAND flash controller on the
	  This enables the driver for the NAND flash controller on the
	  MPC5121 SoC.
	  MPC5121 SoC.


config MTD_NAND_VF610_NFC
	tristate "Support for Freescale NFC for VF610/MPC5125"
	depends on (SOC_VF610 || COMPILE_TEST)
	depends on HAS_IOMEM
	help
	  Enables support for NAND Flash Controller on some Freescale
	  processors like the VF610, MPC5125, MCF54418 or Kinetis K70.
	  The driver supports a maximum 2k page size. With 2k pages and
	  64 bytes or more of OOB, hardware ECC with up to 32-bit error
	  correction is supported. Hardware ECC is only enabled through
	  device tree.

config MTD_NAND_MXC
config MTD_NAND_MXC
	tristate "MXC NAND support"
	tristate "MXC NAND support"
	depends on ARCH_MXC
	depends on ARCH_MXC
@@ -471,7 +490,7 @@ config MTD_NAND_MXC


config MTD_NAND_SH_FLCTL
config MTD_NAND_SH_FLCTL
	tristate "Support for NAND on Renesas SuperH FLCTL"
	tristate "Support for NAND on Renesas SuperH FLCTL"
	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
	depends on SUPERH || COMPILE_TEST
	depends on HAS_IOMEM
	depends on HAS_IOMEM
	depends on HAS_DMA
	depends on HAS_DMA
	help
	help
@@ -518,6 +537,13 @@ config MTD_NAND_JZ4740
	help
	help
		Enables support for NAND Flash on JZ4740 SoC based boards.
		Enables support for NAND Flash on JZ4740 SoC based boards.


config MTD_NAND_JZ4780
	tristate "Support for NAND on JZ4780 SoC"
	depends on MACH_JZ4780 && JZ4780_NEMC
	help
	  Enables support for NAND Flash connected to the NEMC on JZ4780 SoC
	  based boards, using the BCH controller for hardware error correction.

config MTD_NAND_FSMC
config MTD_NAND_FSMC
	tristate "Support for NAND on ST Micros FSMC"
	tristate "Support for NAND on ST Micros FSMC"
	depends on PLAT_SPEAR || ARCH_NOMADIK || ARCH_U8500 || MACH_U300
	depends on PLAT_SPEAR || ARCH_NOMADIK || ARCH_U8500 || MACH_U300
@@ -528,7 +554,6 @@ config MTD_NAND_FSMC
config MTD_NAND_XWAY
config MTD_NAND_XWAY
	tristate "Support for NAND on Lantiq XWAY SoC"
	tristate "Support for NAND on Lantiq XWAY SoC"
	depends on LANTIQ && SOC_TYPE_XWAY
	depends on LANTIQ && SOC_TYPE_XWAY
	select MTD_NAND_PLATFORM
	help
	help
	  Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
	  Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
	  to the External Bus Unit (EBU).
	  to the External Bus Unit (EBU).
@@ -541,9 +566,11 @@ config MTD_NAND_SUNXI


config MTD_NAND_ARASAN
config MTD_NAND_ARASAN
	tristate "Support for Arasan Nand Flash controller"
	tristate "Support for Arasan Nand Flash controller"
	depends on MTD_NAND
	depends on HAS_IOMEM
	depends on HAS_DMA
	help
	help
	  Enables the driver for the Arasan Nand Flash controller in ZynqMP SoC.
	  Enables the driver for the Arasan Nand Flash controller on
	  Zynq Ultrascale+ MPSoC.


config MTD_NAND_HISI504
config MTD_NAND_HISI504
	tristate "Support for NAND controller on Hisilicon SoC Hip04"
	tristate "Support for NAND controller on Hisilicon SoC Hip04"
@@ -551,4 +578,18 @@ config MTD_NAND_HISI504
	help
	help
	  Enables support for NAND controller on Hisilicon SoC Hip04.
	  Enables support for NAND controller on Hisilicon SoC Hip04.


config MTD_NAND_QCOM
	tristate "Support for NAND on QCOM SoCs"
	depends on ARCH_QCOM
	help
	  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
+8 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,8 @@ obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o
obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o
obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o
obj-$(CONFIG_MTD_NAND_ATMEL)		+= atmel_nand.o
obj-$(CONFIG_MTD_NAND_ATMEL)		+= atmel_nand.o
obj-$(CONFIG_MTD_NAND_GPIO)		+= gpio.o
obj-$(CONFIG_MTD_NAND_GPIO)		+= gpio.o
obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2.o
omap2_nand-objs := omap2.o
obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2_nand.o
obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)	+= omap_elm.o
obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)	+= omap_elm.o
obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx270_nand.o
obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx270_nand.o
obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
@@ -45,14 +46,19 @@ obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o
obj-$(CONFIG_MTD_NAND_TXX9NDFMC)	+= txx9ndfmc.o
obj-$(CONFIG_MTD_NAND_TXX9NDFMC)	+= txx9ndfmc.o
obj-$(CONFIG_MTD_NAND_NUC900)		+= nuc900_nand.o
obj-$(CONFIG_MTD_NAND_NUC900)		+= nuc900_nand.o
obj-$(CONFIG_MTD_NAND_MPC5121_NFC)	+= mpc5121_nfc.o
obj-$(CONFIG_MTD_NAND_MPC5121_NFC)	+= mpc5121_nfc.o
obj-$(CONFIG_MTD_NAND_VF610_NFC)	+= vf610_nfc.o
obj-$(CONFIG_MTD_NAND_RICOH)		+= r852.o
obj-$(CONFIG_MTD_NAND_RICOH)		+= r852.o
obj-$(CONFIG_MTD_NAND_JZ4740)		+= jz4740_nand.o
obj-$(CONFIG_MTD_NAND_JZ4740)		+= jz4740_nand.o
obj-$(CONFIG_MTD_NAND_JZ4780)		+= jz4780_nand.o jz4780_bch.o
obj-$(CONFIG_MTD_NAND_GPMI_NAND)	+= gpmi-nand/
obj-$(CONFIG_MTD_NAND_GPMI_NAND)	+= gpmi-nand/
obj-$(CONFIG_MTD_NAND_XWAY)		+= xway_nand.o
obj-$(CONFIG_MTD_NAND_XWAY)		+= xway_nand.o
obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH)	+= bcm47xxnflash/
obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH)	+= bcm47xxnflash/
obj-$(CONFIG_MTD_NAND_SUNXI)		+= sunxi_nand.o
obj-$(CONFIG_MTD_NAND_SUNXI)		+= sunxi_nand.o
obj-$(CONFIG_MTD_NAND_PL35X)		+= pl35x_nand.o
obj-$(CONFIG_MTD_NAND_PL35X)		+= pl35x_nand.o
obj-$(CONFIG_MTD_NAND_ARASAN)		+= arasan_nfc.o
obj-$(CONFIG_MTD_NAND_ARASAN)		+= arasan_nand.o
obj-$(CONFIG_MTD_NAND_HISI504)	        += hisi504_nand.o
obj-$(CONFIG_MTD_NAND_HISI504)	        += hisi504_nand.o
obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= brcmnand/
obj-$(CONFIG_MTD_NAND_QCOM)		+= qcom_nandc.o
obj-$(CONFIG_MTD_NAND_MTK)		+= mtk_nand.o mtk_ecc.o


nand-objs := nand_base.o nand_bbt.o nand_timings.o nandchip-micron.o
nand-objs := nand_base.o nand_bbt.o nand_timings.o nandchip-micron.o