| Message ID | 1523987360-18760-15-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 17 Apr 2018 19:49:14 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote: > 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> Applied to mtd/next. Thanks, Boris > --- > v3: > - Rebase to v4.17-rc1, > > v2: > - Add Reviewed-by, Acked-by, > - Drop RFC state, > - Drop new dependency of MTD_NAND_MARVELL on HAS_DMA, > - Split per subsystem. > --- > drivers/mtd/nand/raw/Kconfig | 8 ++------ > drivers/mtd/spi-nor/Kconfig | 2 +- > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig > index 19a2b283fbbe627e..6871ff0fd300bb81 100644 > --- a/drivers/mtd/nand/raw/Kconfig > +++ b/drivers/mtd/nand/raw/Kconfig > @@ -46,7 +46,7 @@ config MTD_NAND_DENALI > config MTD_NAND_DENALI_PCI > tristate "Support Denali NAND controller on Intel Moorestown" > select MTD_NAND_DENALI > - depends on HAS_DMA && PCI > + depends on PCI > help > Enable the driver for NAND flash on Intel Moorestown, using the > Denali NAND controller core. > @@ -152,7 +152,6 @@ config MTD_NAND_S3C2410_CLKSTOP > config MTD_NAND_TANGO > tristate "NAND Flash support for Tango chips" > depends on ARCH_TANGO || COMPILE_TEST > - depends on HAS_DMA > help > Enables the NAND Flash controller on Tango chips. > > @@ -285,7 +284,7 @@ config MTD_NAND_MARVELL > tristate "NAND controller support on Marvell boards" > depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \ > COMPILE_TEST > - depends on HAS_IOMEM && HAS_DMA > + depends on HAS_IOMEM > help > This enables the NAND flash controller driver for Marvell boards, > including: > @@ -447,7 +446,6 @@ config MTD_NAND_SH_FLCTL > tristate "Support for NAND on Renesas SuperH FLCTL" > depends on SUPERH || COMPILE_TEST > depends on HAS_IOMEM > - depends on HAS_DMA > help > Several Renesas SuperH CPU has FLCTL. This option enables support > for NAND Flash using FLCTL. > @@ -515,7 +513,6 @@ config MTD_NAND_SUNXI > config MTD_NAND_HISI504 > tristate "Support for NAND controller on Hisilicon SoC Hip04" > depends on ARCH_HISI || COMPILE_TEST > - depends on HAS_DMA > help > Enables support for NAND controller on Hisilicon SoC Hip04. > > @@ -529,7 +526,6 @@ config MTD_NAND_QCOM > config MTD_NAND_MTK > tristate "Support for NAND controller on MTK SoCs" > depends on ARCH_MEDIATEK || COMPILE_TEST > - depends on HAS_DMA > help > Enables support for NAND controller on MTK SoCs. > This controller is found on mt27xx, mt81xx, mt65xx SoCs. > diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig > index 89da88e591215db1..c493b8230a38c059 100644 > --- a/drivers/mtd/spi-nor/Kconfig > +++ b/drivers/mtd/spi-nor/Kconfig > @@ -71,7 +71,7 @@ config SPI_FSL_QUADSPI > config SPI_HISI_SFC > tristate "Hisilicon SPI-NOR Flash Controller(SFC)" > depends on ARCH_HISI || COMPILE_TEST > - depends on HAS_IOMEM && HAS_DMA > + depends on HAS_IOMEM > help > This enables support for hisilicon SPI-NOR flash controller. >
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 19a2b283fbbe627e..6871ff0fd300bb81 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -46,7 +46,7 @@ config MTD_NAND_DENALI config MTD_NAND_DENALI_PCI tristate "Support Denali NAND controller on Intel Moorestown" select MTD_NAND_DENALI - depends on HAS_DMA && PCI + depends on PCI help Enable the driver for NAND flash on Intel Moorestown, using the Denali NAND controller core. @@ -152,7 +152,6 @@ config MTD_NAND_S3C2410_CLKSTOP config MTD_NAND_TANGO tristate "NAND Flash support for Tango chips" depends on ARCH_TANGO || COMPILE_TEST - depends on HAS_DMA help Enables the NAND Flash controller on Tango chips. @@ -285,7 +284,7 @@ config MTD_NAND_MARVELL tristate "NAND controller support on Marvell boards" depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \ COMPILE_TEST - depends on HAS_IOMEM && HAS_DMA + depends on HAS_IOMEM help This enables the NAND flash controller driver for Marvell boards, including: @@ -447,7 +446,6 @@ config MTD_NAND_SH_FLCTL tristate "Support for NAND on Renesas SuperH FLCTL" depends on SUPERH || COMPILE_TEST depends on HAS_IOMEM - depends on HAS_DMA help Several Renesas SuperH CPU has FLCTL. This option enables support for NAND Flash using FLCTL. @@ -515,7 +513,6 @@ config MTD_NAND_SUNXI config MTD_NAND_HISI504 tristate "Support for NAND controller on Hisilicon SoC Hip04" depends on ARCH_HISI || COMPILE_TEST - depends on HAS_DMA help Enables support for NAND controller on Hisilicon SoC Hip04. @@ -529,7 +526,6 @@ config MTD_NAND_QCOM config MTD_NAND_MTK tristate "Support for NAND controller on MTK SoCs" depends on ARCH_MEDIATEK || COMPILE_TEST - depends on HAS_DMA help Enables support for NAND controller on MTK SoCs. This controller is found on mt27xx, mt81xx, mt65xx SoCs. diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig index 89da88e591215db1..c493b8230a38c059 100644 --- a/drivers/mtd/spi-nor/Kconfig +++ b/drivers/mtd/spi-nor/Kconfig @@ -71,7 +71,7 @@ config SPI_FSL_QUADSPI config SPI_HISI_SFC tristate "Hisilicon SPI-NOR Flash Controller(SFC)" depends on ARCH_HISI || COMPILE_TEST - depends on HAS_IOMEM && HAS_DMA + depends on HAS_IOMEM help This enables support for hisilicon SPI-NOR flash controller.