Merge remote-tracking branch 'edac-amd/for-next'

[deliverable/linux.git] / drivers / edac / Kconfig

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index dff1a4a6dc1b5cd63df8071564e3606c4305e44e..82d85cce81f815b9b8bf70352e3bdeeece2d7d41 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -266,6 +266,13 @@ config EDAC_MPC85XX
          Support for error detection and correction on the Freescale
          MPC8349, MPC8560, MPC8540, MPC8548, T4240
 
+config EDAC_LAYERSCAPE
+       tristate "Freescale Layerscape DDR"
+       depends on EDAC_MM_EDAC && ARCH_LAYERSCAPE
+       help
+         Support for error detection and correction on Freescale memory
+         controllers on Layerscape SoCs.
+
 config EDAC_MV64X60
        tristate "Marvell MV64x60"
        depends on EDAC_MM_EDAC && MV64X60
@@ -406,6 +413,41 @@ config EDAC_ALTERA_ETHERNET
          Support for error detection and correction on the
          Altera Ethernet FIFO Memory for Altera SoCs.
 
+config EDAC_ALTERA_NAND
+       bool "Altera NAND FIFO ECC"
+       depends on EDAC_ALTERA=y && MTD_NAND_DENALI
+       help
+         Support for error detection and correction on the
+         Altera NAND FIFO Memory for Altera SoCs.
+
+config EDAC_ALTERA_DMA
+       bool "Altera DMA FIFO ECC"
+       depends on EDAC_ALTERA=y && PL330_DMA=y
+       help
+         Support for error detection and correction on the
+         Altera DMA FIFO Memory for Altera SoCs.
+
+config EDAC_ALTERA_USB
+       bool "Altera USB FIFO ECC"
+       depends on EDAC_ALTERA=y && USB_DWC2
+       help
+         Support for error detection and correction on the
+         Altera USB FIFO Memory for Altera SoCs.
+
+config EDAC_ALTERA_QSPI
+       bool "Altera QSPI FIFO ECC"
+       depends on EDAC_ALTERA=y && SPI_CADENCE_QUADSPI
+       help
+         Support for error detection and correction on the
+         Altera QSPI FIFO Memory for Altera SoCs.
+
+config EDAC_ALTERA_SDMMC
+       bool "Altera SDMMC FIFO ECC"
+       depends on EDAC_ALTERA=y && MMC_DW
+       help
+         Support for error detection and correction on the
+         Altera SDMMC FIFO Memory for Altera SoCs.
+
 config EDAC_SYNOPSYS
        tristate "Synopsys DDR Memory Controller"
        depends on EDAC_MM_EDAC && ARCH_ZYNQ