From patchwork Wed Aug 30 12:22:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 111305 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp836388qge; Wed, 30 Aug 2017 05:22:25 -0700 (PDT) X-Received: by 10.99.112.20 with SMTP id l20mr1364377pgc.56.1504095745739; Wed, 30 Aug 2017 05:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504095745; cv=none; d=google.com; s=arc-20160816; b=ET7oZFP4JvVqeG+xiSu28FUD8BCYUREmOwNhOSU6n3Y6/JOA/eeU9ccZKtCMca6Tkr gJJySHFT5U61uY2U5I4yI2wyb5SaLCIPPEKAnR/K3dgaDkgHovrLsjpsepHqCwLUi62h tqch3kcpB2+pavHj9+2QW+uXdDdELUzPnBfWpzTjuU0wgAAKiAKeAX8+xCw7ORSJ9evJ UiPWZgqsGq6txCThGjQqw8GVQVLXf7j4MuyrnEfGDRyfKwXdk1TvkmJTRz4BsBy7e0YN IewFndcrF+7fvGHfthaylnFKLdnqL9fxl98oPyclCiqD14Ksgk7lFV943mqM835H1Y98 9FdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=0vL5OxVorrrCLzPMDwoU7BVcHEiuEPaQ1DfEUy239r8=; b=JXqB85G9b1W05GiN438905X5ZOvK/Jh7qzmczPa48167GgKvUiujV/Or4/4lvWtzRs mZ0Fw+s6pg/EyhEseAWMTEUTxOYIwKMgifjcGflU8uxtzylnKSoX17vq90+mymHYbtnB 3UFnqyFR5phU2wczMwVN/P36q+S1WvsZoS8SrOjrWgxISySB6rKQJIrs+CJ+n5Jx97z4 8YUzW6SiP63mjC3XCn+Yl6YmzxUOoBJb4yqyNSBtkLc+jj8S0TsbcYVFavmZ9nEis2/n D33DrzZQDYoWKSeJCBpP+haETPGTqz/LMFGT6GK9XK98pV37vRHX3+VqtqlGN7vLszcl oqzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cz6Wtiz+; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a12si4600333pli.688.2017.08.30.05.22.25; Wed, 30 Aug 2017 05:22:25 -0700 (PDT) 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=@linaro.org header.s=google header.b=Cz6Wtiz+; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751417AbdH3MWX (ORCPT + 26 others); Wed, 30 Aug 2017 08:22:23 -0400 Received: from mail-io0-f174.google.com ([209.85.223.174]:33841 "EHLO mail-io0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323AbdH3MWV (ORCPT ); Wed, 30 Aug 2017 08:22:21 -0400 Received: by mail-io0-f174.google.com with SMTP id n71so4530261iod.1 for ; Wed, 30 Aug 2017 05:22:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=0vL5OxVorrrCLzPMDwoU7BVcHEiuEPaQ1DfEUy239r8=; b=Cz6Wtiz+39Lhl3Uz4pn8AKYWOQ28uacXZ6KRqcbTvTz2snb1X+RC8YIBvKpH9JHSaf KBiPRs74VEvu9edWCRLrXvpBpLMzXaydCKm5l5jwS04+N4J1l0tI8Kr3iZEMblElFLpb UDOgFVwt4tgr2uJEF4mr7vch8/VqKkrmT9ux4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0vL5OxVorrrCLzPMDwoU7BVcHEiuEPaQ1DfEUy239r8=; b=h3XJVNPjYZdcZDyhcw2RY1pjlv/ju1FLidnv8PO+Gp747IwJhQPTjo3L5TH5k9hA+o rFovS9uPB9A0irE9R3XANyWapmKi/2jbuKGHig/j5TyTwEAyqkRM5bsJl6M28ymfCq06 8j5PnDHxu5czWumuhQNYIjor7/SLVSgf3miiT45Ue3Srn/86RUqqp6797QQGWlfdKaJa Qm8GMjMX7IPTLJiBrsUuHyCEciuxzmRyXmnWxMmQ0smuqgXQcOpc3rRf/PpzL5CkQZWk ama77lvUNABigUEPWTj8Fel0+nqQmXBxJfWMRFhopT3yvcHdyNYhDv4J1Vr/oM0SXObK M53g== X-Gm-Message-State: AHPjjUi6Z9w9p51Zgz7F7i+RqFYinLGru5lkXpeiKfUcANrP0uHNTvuP yV7tD33nWer2i//P X-Google-Smtp-Source: ADKCNb7juJrxfPqR0tn93tJBrZvX2wHeIf3mr8VYi8OzZ1aICZxUiu6IGUsm2hL3QKQH4Rl1n5mnGg== X-Received: by 10.107.182.134 with SMTP id g128mr1221882iof.261.1504095741084; Wed, 30 Aug 2017 05:22:21 -0700 (PDT) Received: from localhost.localdomain (static.8.26.4.46.clients.your-server.de. [46.4.26.8]) by smtp.gmail.com with ESMTPSA id a68sm2507573ioa.69.2017.08.30.05.22.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Aug 2017 05:22:20 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: ulf.hansson@linaro.org Cc: arnd@arndb.de, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2] mmc: mmci: stop building qcom dml as module Date: Wed, 30 Aug 2017 14:22:12 +0200 Message-Id: <20170830122212.8590-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla It does not make sense for qcom dml code to be a seperate module, as this has just 2 helper functions specific to qcom, and used directly by mmci driver, so just compile this along with main mmci driver. This would also fix issues arrising due to Kconfig combinations between mmci and qcom dml. Signed-off-by: Srinivas Kandagatla --- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.9.3 diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 5755b69..3345384 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -15,7 +15,7 @@ config MMC_ARMMMCI If unsure, say N. config MMC_QCOM_DML - tristate "Qualcomm Data Mover for SD Card Controller" + bool "Qualcomm Data Mover for SD Card Controller" depends on MMC_ARMMMCI && QCOM_BAM_DMA default y help diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 4d45471..ef12fd2 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -2,8 +2,9 @@ # Makefile for MMC/SD host controller drivers # -obj-$(CONFIG_MMC_ARMMMCI) += mmci.o -obj-$(CONFIG_MMC_QCOM_DML) += mmci_qcom_dml.o +obj-$(CONFIG_MMC_ARMMMCI) += armmmci.o +armmmci-y := mmci.o +armmmci-$(CONFIG_MMC_QCOM_DML) += mmci_qcom_dml.o obj-$(CONFIG_MMC_PXA) += pxamci.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_MXS) += mxs-mmc.o