From patchwork Fri Nov 24 16:24:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 119618 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2448449qgn; Fri, 24 Nov 2017 08:31:38 -0800 (PST) X-Google-Smtp-Source: AGs4zMZLmny1aQ3GTuKIivJWmwTakFWEtnVpXeDnJK7GjBsbeCHd0i6E0djF+8Qzn3zT+eO6P1Lg X-Received: by 10.98.89.220 with SMTP id k89mr27864877pfj.36.1511541098035; Fri, 24 Nov 2017 08:31:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511541098; cv=none; d=google.com; s=arc-20160816; b=xIYA3sL0hlzinBhECIK/dGXG9Ez2A4u38w97vOakoh94JmMLFg8Wq41OXpieti69fQ QAoaIzr6BUy3Lg+0Vn8fhCyzjzqPYiL/7zQErca9VX+Vex5K5IJKalKj/B9cQv5ZFUqc 44nBlTFAi4RCjsNVzdITsuNLq1ZX/1PmLuHPVSPjCHwpwRMGhW8YHpFiw6vnZeb2/aMg POCMFLvBT5QjCvl5givgSpfYyWT6qoZnjBoEWAh74rqv/EvSA11f2uguqM6PcZDMjDr9 wLbZ5EwygzqJd5/7MfXYpUxq5tZObo0pL+TXR/hDKkJIDO3aHms8UQbmpKqEDdz1Fcgd aZ6Q== 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=E+VSlDOPtB5N7WPuRtcdaoCZ1kINQI40NTX/+NzE/pM=; b=z6K4fMcQ7P4YyFTHKLJllDy9mZGrdtCeoOaDIaueiN5zkB98XC0qzYx7SxkirUX0+o cGP6T3DWt58JR9kW6yQJD1pLOXw3jy+HAOzCGFYuuIELHqAppRZUR22BPNzFc19FywmO ePHQU7BRRGdy7utzKNTqVW+2EAq6QhZvPXtriL3QaPNjBUKCRgCMtFTIbP96+sbMBgNz /w/CaUSLzuTEVKC0t6urFzgY1e7WNIKxhc3WYi7LfmxeieDpPXFcj/2ASLvkaXguVSqb HbHoII1bbM+5vUidnUBs80rRA7v3YW2514jr+74jHLBfh6us/tdASFv9oB51/N9Q+w9r A32g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vQmk1sRO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 z7si18108736pgp.129.2017.11.24.08.31.37; Fri, 24 Nov 2017 08:31:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vQmk1sRO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754054AbdKXQbX (ORCPT + 28 others); Fri, 24 Nov 2017 11:31:23 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:61432 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753613AbdKXQZ6 (ORCPT ); Fri, 24 Nov 2017 11:25:58 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-11.nifty.com with ESMTP id vAOGP9Vl007100; Sat, 25 Nov 2017 01:25:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com vAOGP9Vl007100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1511540710; bh=E+VSlDOPtB5N7WPuRtcdaoCZ1kINQI40NTX/+NzE/pM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vQmk1sROsVXSI9JqMCOqvk92Qr/sebKVDiORi6z61yjF7VOD8m0e4lDtkH0EJzlP1 +aoll8HcTwm/052aTwyYN56W0HT49p3KlmmpiySJip7YWrtxpPeuC02S2umTyN+01N AAMpVxseGNV9FpqLHyZOX28X8pidF8fRosXLfHfdk5zvCs7IcgTvvC0alAzVtoWEfD 21TUYZJT8s2PB0FuEpEhv9K/zXNXlRPom28evOb+PKu3fe3PPFpzvny/jt647rpZ4P zGla3fqtQ8Y7Igzk/4b1capejn8l4RsPWj4zlqOlLs9A9iTM/cZawkeHb0sDCfqHXj UgBjGZ68pbtuQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-mmc@vger.kernel.org, Wolfram Sang Cc: Simon Horman , Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v2 01/22] mmc: renesas_sdhi: consolidate DMAC CONFIG options Date: Sat, 25 Nov 2017 01:24:36 +0900 Message-Id: <1511540697-27387-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511540697-27387-1-git-send-email-yamada.masahiro@socionext.com> References: <1511540697-27387-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The description in the Makefile is odd. Fix the CONFIG selection in a cleaner way. Signed-off-by: Masahiro Yamada Acked-by: Wolfram Sang --- Changes in v2: - Fix a typo consilidate -> consolidate drivers/mmc/host/Kconfig | 4 ++-- drivers/mmc/host/Makefile | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 567028c..1932188 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -598,8 +598,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 @@ -607,6 +605,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 @@ -616,6 +615,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 a43cf0d..559bd9e 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