Commit 1d6efe08 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Ulf Hansson

mmc: 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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent eef797ac
...@@ -358,7 +358,6 @@ config MMC_MESON_MX_SDIO ...@@ -358,7 +358,6 @@ config MMC_MESON_MX_SDIO
tristate "Amlogic Meson6/Meson8/Meson8b SD/MMC Host Controller support" tristate "Amlogic Meson6/Meson8/Meson8b SD/MMC Host Controller support"
depends on ARCH_MESON || COMPILE_TEST depends on ARCH_MESON || COMPILE_TEST
depends on COMMON_CLK depends on COMMON_CLK
depends on HAS_DMA
depends on OF depends on OF
help help
This selects support for the SD/MMC Host Controller on This selects support for the SD/MMC Host Controller on
...@@ -401,7 +400,6 @@ config MMC_OMAP ...@@ -401,7 +400,6 @@ config MMC_OMAP
config MMC_OMAP_HS config MMC_OMAP_HS
tristate "TI OMAP High Speed Multimedia Card Interface support" tristate "TI OMAP High Speed Multimedia Card Interface support"
depends on HAS_DMA
depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST
help help
This selects the TI OMAP High Speed Multimedia card Interface. This selects the TI OMAP High Speed Multimedia card Interface.
...@@ -511,7 +509,6 @@ config MMC_DAVINCI ...@@ -511,7 +509,6 @@ config MMC_DAVINCI
config MMC_GOLDFISH config MMC_GOLDFISH
tristate "goldfish qemu Multimedia Card Interface support" tristate "goldfish qemu Multimedia Card Interface support"
depends on HAS_DMA
depends on GOLDFISH || COMPILE_TEST depends on GOLDFISH || COMPILE_TEST
help help
This selects the Goldfish Multimedia card Interface emulation This selects the Goldfish Multimedia card Interface emulation
...@@ -605,7 +602,7 @@ config MMC_SDHI ...@@ -605,7 +602,7 @@ config MMC_SDHI
config MMC_SDHI_SYS_DMAC config MMC_SDHI_SYS_DMAC
tristate "DMA for SDHI SD/SDIO controllers using SYS-DMAC" tristate "DMA for SDHI SD/SDIO controllers using SYS-DMAC"
depends on MMC_SDHI && HAS_DMA depends on MMC_SDHI
default MMC_SDHI if (SUPERH || ARM) default MMC_SDHI if (SUPERH || ARM)
help help
This provides DMA support for SDHI SD/SDIO controllers This provides DMA support for SDHI SD/SDIO controllers
...@@ -615,7 +612,7 @@ config MMC_SDHI_SYS_DMAC ...@@ -615,7 +612,7 @@ config MMC_SDHI_SYS_DMAC
config MMC_SDHI_INTERNAL_DMAC config MMC_SDHI_INTERNAL_DMAC
tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering" tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering"
depends on ARM64 || COMPILE_TEST depends on ARM64 || COMPILE_TEST
depends on MMC_SDHI && HAS_DMA depends on MMC_SDHI
default MMC_SDHI if ARM64 default MMC_SDHI if ARM64
help help
This provides DMA support for SDHI SD/SDIO controllers This provides DMA support for SDHI SD/SDIO controllers
...@@ -669,7 +666,6 @@ config MMC_CAVIUM_THUNDERX ...@@ -669,7 +666,6 @@ config MMC_CAVIUM_THUNDERX
config MMC_DW config MMC_DW
tristate "Synopsys DesignWare Memory Card Interface" tristate "Synopsys DesignWare Memory Card Interface"
depends on HAS_DMA
depends on ARC || ARM || ARM64 || MIPS || COMPILE_TEST depends on ARC || ARM || ARM64 || MIPS || COMPILE_TEST
help help
This selects support for the Synopsys DesignWare Mobile Storage IP This selects support for the Synopsys DesignWare Mobile Storage IP
...@@ -748,7 +744,6 @@ config MMC_DW_ZX ...@@ -748,7 +744,6 @@ config MMC_DW_ZX
config MMC_SH_MMCIF config MMC_SH_MMCIF
tristate "SuperH Internal MMCIF support" tristate "SuperH Internal MMCIF support"
depends on HAS_DMA
depends on SUPERH || ARCH_RENESAS || COMPILE_TEST depends on SUPERH || ARCH_RENESAS || COMPILE_TEST
help help
This selects the MMC Host Interface controller (MMCIF) found in various This selects the MMC Host Interface controller (MMCIF) found in various
...@@ -869,7 +864,6 @@ config MMC_TOSHIBA_PCI ...@@ -869,7 +864,6 @@ config MMC_TOSHIBA_PCI
config MMC_BCM2835 config MMC_BCM2835
tristate "Broadcom BCM2835 SDHOST MMC Controller support" tristate "Broadcom BCM2835 SDHOST MMC Controller support"
depends on ARCH_BCM2835 || COMPILE_TEST depends on ARCH_BCM2835 || COMPILE_TEST
depends on HAS_DMA
help help
This selects the BCM2835 SDHOST MMC controller. If you have This selects the BCM2835 SDHOST MMC controller. If you have
a BCM2835 platform with SD or MMC devices, say Y or M here. a BCM2835 platform with SD or MMC devices, say Y or M here.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment