Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c813e10a authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: consolidate DMAC CONFIG options 



The description in the Makefile is odd.  Fix the CONFIG selection
in a cleaner way.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2408a085

drivers/mmc/host/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -599,8 +599,6 @@ config MMC_SDHI 
	depends on SUPERH || ARM || ARM64

	depends on SUPERH || ARCH_RENESAS || COMPILE_TEST

	select MMC_TMIO_CORE

	select MMC_SDHI_SYS_DMAC if (SUPERH || ARM)

	select MMC_SDHI_INTERNAL_DMAC if ARM64

	help

	  This provides support for the SDHI SD/SDIO controller found in

	  Renesas SuperH, ARM and ARM64 based SoCs
@@ -608,6 +606,7 @@ config MMC_SDHI 
config MMC_SDHI_SYS_DMAC

	tristate "DMA for SDHI SD/SDIO controllers using SYS-DMAC"

	depends on MMC_SDHI

	default MMC_SDHI if (SUPERH || ARM)

	help

	  This provides DMA support for SDHI SD/SDIO controllers

	  using SYS-DMAC via DMA Engine. This supports the controllers
@@ -617,6 +616,7 @@ config MMC_SDHI_INTERNAL_DMAC 
	tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering"

	depends on ARM64 || COMPILE_TEST

	depends on MMC_SDHI

	default MMC_SDHI if ARM64

	help

	  This provides DMA support for SDHI SD/SDIO controllers

	  using on-chip bus mastering. This supports the controllers

drivers/mmc/host/Makefile

+2 −6
Original line number Diff line number Diff line
@@ -39,12 +39,8 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o 
obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o

obj-$(CONFIG_MMC_TMIO_CORE)	+= tmio_mmc_core.o

obj-$(CONFIG_MMC_SDHI)		+= renesas_sdhi_core.o

ifeq ($(subst m,y,$(CONFIG_MMC_SDHI_SYS_DMAC)),y)

obj-$(CONFIG_MMC_SDHI)		+= renesas_sdhi_sys_dmac.o

endif

ifeq ($(subst m,y,$(CONFIG_MMC_SDHI_INTERNAL_DMAC)),y)

obj-$(CONFIG_MMC_SDHI)		+= renesas_sdhi_internal_dmac.o

endif

obj-$(CONFIG_MMC_SDHI_SYS_DMAC)		+= renesas_sdhi_sys_dmac.o

obj-$(CONFIG_MMC_SDHI_INTERNAL_DMAC)	+= renesas_sdhi_internal_dmac.o

obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o

obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o

obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o