瀏覽代碼

mtd: Remove depends on HAS_DMA in case of platform dependency

Remove dependencies on HAS_DMA where a Kconfig symbol depends on another
symbol that implies HAS_DMA, and, optionally, on "|| COMPILE_TEST".
In most cases this other symbol is an architecture or platform specific
symbol, or PCI.

Generic symbols and drivers without platform dependencies keep their
dependencies on HAS_DMA, to prevent compiling subsystems or drivers that
cannot work anyway.

This simplifies the dependencies, and allows to improve compile-testing.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Geert Uytterhoeven 7 年之前
父節點
當前提交
7db782bc18
共有 2 個文件被更改,包括 3 次插入7 次删除
  1. 2 6
      drivers/mtd/nand/raw/Kconfig
  2. 1 1
      drivers/mtd/spi-nor/Kconfig

+ 2 - 6
drivers/mtd/nand/raw/Kconfig

@@ -46,7 +46,7 @@ config MTD_NAND_DENALI
 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"
 	select MTD_NAND_DENALI
 	select MTD_NAND_DENALI
-	depends on HAS_DMA && PCI
+	depends on 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.
@@ -152,7 +152,6 @@ config MTD_NAND_S3C2410_CLKSTOP
 config MTD_NAND_TANGO
 config MTD_NAND_TANGO
 	tristate "NAND Flash support for Tango chips"
 	tristate "NAND Flash support for Tango chips"
 	depends on ARCH_TANGO || COMPILE_TEST
 	depends on ARCH_TANGO || COMPILE_TEST
-	depends on HAS_DMA
 	help
 	help
 	  Enables the NAND Flash controller on Tango chips.
 	  Enables the NAND Flash controller on Tango chips.
 
 
@@ -285,7 +284,7 @@ config MTD_NAND_MARVELL
 	tristate "NAND controller support on Marvell boards"
 	tristate "NAND controller support on Marvell boards"
 	depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \
 	depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \
 		   COMPILE_TEST
 		   COMPILE_TEST
-	depends on HAS_IOMEM && HAS_DMA
+	depends on HAS_IOMEM
 	help
 	help
 	  This enables the NAND flash controller driver for Marvell boards,
 	  This enables the NAND flash controller driver for Marvell boards,
 	  including:
 	  including:
@@ -447,7 +446,6 @@ config MTD_NAND_SH_FLCTL
 	tristate "Support for NAND on Renesas SuperH FLCTL"
 	tristate "Support for NAND on Renesas SuperH FLCTL"
 	depends on SUPERH || COMPILE_TEST
 	depends on SUPERH || COMPILE_TEST
 	depends on HAS_IOMEM
 	depends on HAS_IOMEM
-	depends on HAS_DMA
 	help
 	help
 	  Several Renesas SuperH CPU has FLCTL. This option enables support
 	  Several Renesas SuperH CPU has FLCTL. This option enables support
 	  for NAND Flash using FLCTL.
 	  for NAND Flash using FLCTL.
@@ -515,7 +513,6 @@ config MTD_NAND_SUNXI
 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"
 	depends on ARCH_HISI || COMPILE_TEST
 	depends on ARCH_HISI || COMPILE_TEST
-	depends on HAS_DMA
 	help
 	help
 	  Enables support for NAND controller on Hisilicon SoC Hip04.
 	  Enables support for NAND controller on Hisilicon SoC Hip04.
 
 
@@ -529,7 +526,6 @@ config MTD_NAND_QCOM
 config MTD_NAND_MTK
 config MTD_NAND_MTK
 	tristate "Support for NAND controller on MTK SoCs"
 	tristate "Support for NAND controller on MTK SoCs"
 	depends on ARCH_MEDIATEK || COMPILE_TEST
 	depends on ARCH_MEDIATEK || COMPILE_TEST
-	depends on HAS_DMA
 	help
 	help
 	  Enables support for NAND controller on MTK SoCs.
 	  Enables support for NAND controller on MTK SoCs.
 	  This controller is found on mt27xx, mt81xx, mt65xx SoCs.
 	  This controller is found on mt27xx, mt81xx, mt65xx SoCs.

+ 1 - 1
drivers/mtd/spi-nor/Kconfig

@@ -71,7 +71,7 @@ config SPI_FSL_QUADSPI
 config SPI_HISI_SFC
 config SPI_HISI_SFC
 	tristate "Hisilicon SPI-NOR Flash Controller(SFC)"
 	tristate "Hisilicon SPI-NOR Flash Controller(SFC)"
 	depends on ARCH_HISI || COMPILE_TEST
 	depends on ARCH_HISI || COMPILE_TEST
-	depends on HAS_IOMEM && HAS_DMA
+	depends on HAS_IOMEM
 	help
 	help
 	  This enables support for hisilicon SPI-NOR flash controller.
 	  This enables support for hisilicon SPI-NOR flash controller.