From patchwork Tue Nov 7 07:57:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 118114 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3675212qgn; Mon, 6 Nov 2017 23:58:23 -0800 (PST) X-Google-Smtp-Source: ABhQp+Stpnn87O6BoED7w28dxode/0Yc16mPlWSaP19XXVLE/JdiEABiJZeQG8PA06ubD6ps29BT X-Received: by 10.159.253.1 with SMTP id p1mr15867871pls.97.1510041503711; Mon, 06 Nov 2017 23:58:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510041503; cv=none; d=google.com; s=arc-20160816; b=TrLcKLLOlMQBxzghvFPeI86f25NQjOoAI9G1d4UC2teX7f3YyeDQFeFYLh0lkIGsSg eGogZKWTLkDssGukqiGPTqVE22/40LvKkGv35JNuBMa6hQ2CeOciReHMyhCWXHVgUgAW xY2GXJCqj0/uOpEmJUiiDhLFXOg/sLM03rqceKMNxxo5hhp15NTG0XSATV1BgUP82/TY f/GQJP8UI5elifAcbEYJAxMQ6yqbH0hvb/GPQbiyLWt0SzhZv1Jy3qTXk1m5++YZSzlb aC00OF0utKmRH811e5OD/hcHj5N7f/QhznFp/BMnvAJfzwrzEgE/4/pZLg2xjtwkY/MY OPqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=KCFMZo1cp2DRfoXM33rPm9zwxd0Jefgm7YushR3g8xU=; b=PHJtwQMhXliO1fcC+zxMkQOS4hRHEOwPZA2gkEPid/ZuV/jdM7aUJBEv9arDkhf0fw 0pfAdbT+5uwKbbU9BPJjTQcDv4BDpimEbl/VO49ra0PezsdFRS9K4AsSDBawR1GPlxMe 0smUFKXugADnZXxy5IrPumOAw7pFKlexBman2bN4fAOnnKN2PHTdziUbkRnHqWUP4lYX vm6YYIf8tGjCFXr7D+fYdEMbQUDFxZjf5JzsCTDx3mhTFTK87zEXqPy2PNC3Ao/l0CAA P5WERZiEfIWqe7dISqIGzpJk9qFQxdqX8Jn6amN9Z2nmDk0/MQtELGctgDlHoBzB2Ivf ADng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=BFMOGyqF; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d7si580864pgf.4.2017.11.06.23.58.23; Mon, 06 Nov 2017 23:58:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=BFMOGyqF; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756512AbdKGH6W (ORCPT + 6 others); Tue, 7 Nov 2017 02:58:22 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:63746 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756336AbdKGH6V (ORCPT ); Tue, 7 Nov 2017 02:58:21 -0500 X-Greylist: delayed 300 seconds by postgrey-1.27 at vger.kernel.org; Tue, 07 Nov 2017 02:58:21 EST Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id vA77vRop029110; Tue, 7 Nov 2017 16:57:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com vA77vRop029110 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1510041449; bh=Ey7gyUBbTx2ycMQjl+6ff5omlGJAfpKVPHBwwWLuEhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BFMOGyqF3WkFs5jlryS/1/3U5RKLguphZDshPed3DbPXnYkCLmHbHM0I9Jiy1u8Xh Fcb9YTJ0mv/UMpUvmVoyC9gWQdKnx/TaEz4I8daM6NAQfLyB2azU4c3thvfZlugdyM acmZPVr7wcYPOpUz1rFPMtfbj0TLJnMiepHOMT8UTZvl0zE6SDdj1WOGjqvwrIMSRK Y0T1wesx7Fq/KWvO0ChbRlMuQDBOnNqkOTqsiW1jHX6OP9G5RUKLShEq1JUhmZZF9A uY+Zgo3YELm7Y3OqciTb0Qtfe8a/SduXXibBjxVVcoEIJD2gxmTxokrh9Ly0AdoNBX JNysGatCiYKLg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Wolfram Sang , linux-mmc@vger.kernel.org Cc: Simon Horman , Yoshihiro Shimoda , Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH 1/2] mmc: renesas_sdhi: consilidate DMAC CONFIG options Date: Tue, 7 Nov 2017 16:57:21 +0900 Message-Id: <1510041442-15176-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510041442-15176-1-git-send-email-yamada.masahiro@socionext.com> References: <1510041442-15176-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The description in the Makefile is odd. Fix the CONFIG selection in a cleaner way. Signed-off-by: Masahiro Yamada --- drivers/mmc/host/Kconfig | 4 ++-- drivers/mmc/host/Makefile | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Wolfram Sang diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index d371e37..5420da5 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -584,8 +584,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 @@ -593,6 +591,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 @@ -602,6 +601,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 diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 5a548cb..e165d2e 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -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