From patchwork Fri Mar 21 12:14:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 26823 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BDE44203AB for ; Fri, 21 Mar 2014 12:15:17 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp18sf8555199obc.8 for ; Fri, 21 Mar 2014 05:15:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=TJqKf/w0P6SDhltX/p39vafTwa2XSSmMT6jq2mOr5nE=; b=ZE6fIPV9p7B3+XAwzUZW5s9nUt+u+GMTPX64R3C4Mq9lEfJFqaZUqUQmLIo1nFP5pd hZwYzgRIPqxXuRMRVRvTSdOgBgs3/nTxLxCE6ieG2nWw0Kj6sG2/76Mqdggr0XEabQiL ZcQ/xypC75lOdC9P+mRch0j7UmrnN75SO0KoxDzR59l86SjMAmAzrlD15w+otIHomazA 8oTdrA8TLjA3eLqg7mwdy4tvK0svBI86fDF3/o8Amro63xOXMGLxBAWt3DgeDkpCxGlO iOf7qDVxWhlxs9wsu5c8Isr4NTlP39cmIBl0eL88beFq+TRE+AAu4aDlpCEaqLYo0oHn Tcmw== X-Gm-Message-State: ALoCoQm2q4mnnejUjUHfW2ceYlsJoGfkJmAnBE6DQJvszkA+dZ6iEK3yuRLXpsG7CYb6vKBhft3A X-Received: by 10.182.153.68 with SMTP id ve4mr6033304obb.39.1395404117325; Fri, 21 Mar 2014 05:15:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.3 with SMTP id 3ls660291qgc.83.gmail; Fri, 21 Mar 2014 05:15:17 -0700 (PDT) X-Received: by 10.58.220.161 with SMTP id px1mr37795536vec.13.1395404117213; Fri, 21 Mar 2014 05:15:17 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id sg4si1072362vcb.119.2014.03.21.05.15.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so2449666vcb.39 for ; Fri, 21 Mar 2014 05:15:17 -0700 (PDT) X-Received: by 10.58.57.67 with SMTP id g3mr36850311veq.3.1395404117142; Fri, 21 Mar 2014 05:15:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.78.9 with SMTP id i9csp26011vck; Fri, 21 Mar 2014 05:15:16 -0700 (PDT) X-Received: by 10.152.184.66 with SMTP id es2mr6522041lac.22.1395404116232; Fri, 21 Mar 2014 05:15:16 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com [209.85.215.47]) by mx.google.com with ESMTPS id be6si3903283lbc.102.2014.03.21.05.15.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.47 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id y1so1573033lam.20 for ; Fri, 21 Mar 2014 05:15:15 -0700 (PDT) X-Received: by 10.112.52.225 with SMTP id w1mr28129475lbo.22.1395404115591; Fri, 21 Mar 2014 05:15:15 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id tq9sm3255263lbb.10.2014.03.21.05.15.13 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:14 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Cc: devicetree@vger.kernel.org, Ulf Hansson Subject: [PATCH 18/20] mmc: mmci: Enforce mmc capabilities through DT Date: Fri, 21 Mar 2014 13:14:15 +0100 Message-Id: <1395404057-27835-19-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> References: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Remove the option to provide the flags for mmc capabilities as platform data, enforce it through DT. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 2 -- include/linux/amba/mmci.h | 5 ----- 2 files changed, 7 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index bef3f85..a7bda79 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1516,8 +1516,6 @@ static int mmci_probe(struct amba_device *dev, dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n"); /* DT takes precedence over platform data. */ - mmc->caps = np ? mmc->caps : plat->capabilities; - mmc->caps2 = np ? mmc->caps2 : plat->capabilities2; if (!np) { if (!plat->cd_invert) mmc->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH; diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 0d3ff95..b992fc9 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -29,9 +29,6 @@ struct dma_chan; * @gpio_wp: read this GPIO pin to see if the card is write protected * @gpio_cd: read this GPIO pin to detect card insertion * @cd_invert: true if the gpio_cd pin value is active low - * @capabilities: the capabilities of the block as implemented in - * this platform, signify anything MMC_CAP_* from mmc/host.h - * @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h * @dma_filter: function used to select an appropriate RX and TX * DMA channel to be used for DMA, if and only if you're deploying the * generic DMA engine @@ -52,8 +49,6 @@ struct mmci_platform_data { int gpio_wp; int gpio_cd; bool cd_invert; - unsigned long capabilities; - unsigned long capabilities2; bool (*dma_filter)(struct dma_chan *chan, void *filter_param); void *dma_rx_param; void *dma_tx_param;