From patchwork Mon Mar 31 15:18:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 27476 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DADB6202E0 for ; Mon, 31 Mar 2014 15:18:55 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kq14sf22007230pab.2 for ; Mon, 31 Mar 2014 08:18:55 -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=8DDXIXlACvi7flAP3PRUYFMqLVNIMMF4K9BRPfqOxdE=; b=mg/ntT3G5b11P3BafcwaLVmy8POAb3eMlEaJIpZvoGs737RdFoVnfnId7qzzk82POP WxYptckgLPAuTHgUrbH2ht2tJCVFcf/qAAvFYz6yqtj5tC39Zk0P9mGMle1Jd6GxYctq tVNNmaNtnSE5/1Mp5StqebFtUt0lzYo+VsXens3Yx7+wsKkmv4VhCGg7ivJetipi1AXB GUyVEXETwM2RgmV5HWLoWGF4cu36Q0MTfbqS2fOwv3zr9j8/pMEgckjuKFKZnPFLcI1b qpxIbeF7C+vRAJOOEw5hIix8EvOv4xjRU0qzqEiRpliPIDZFXgyuLb4Ww4tK45qkEj6C IDag== X-Gm-Message-State: ALoCoQn4zg2L6KlGfSuNqtTkw4N5ySsEcLhT+2lY93RhkBlCPIyJGLn5kEPYmZ9Zm0QH4RZR/8wM X-Received: by 10.66.144.228 with SMTP id sp4mr10216631pab.5.1396279135099; Mon, 31 Mar 2014 08:18:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.203 with SMTP id n69ls2398952qgd.96.gmail; Mon, 31 Mar 2014 08:18:54 -0700 (PDT) X-Received: by 10.59.9.38 with SMTP id dp6mr1399029ved.24.1396279134912; Mon, 31 Mar 2014 08:18:54 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id s7si2444733vev.164.2014.03.31.08.18.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:54 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so8119786veb.6 for ; Mon, 31 Mar 2014 08:18:54 -0700 (PDT) X-Received: by 10.58.201.5 with SMTP id jw5mr22936553vec.6.1396279134838; Mon, 31 Mar 2014 08:18:54 -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.12.8 with SMTP id v8csp150813vcv; Mon, 31 Mar 2014 08:18:54 -0700 (PDT) X-Received: by 10.194.24.194 with SMTP id w2mr15308689wjf.25.1396279133950; Mon, 31 Mar 2014 08:18:53 -0700 (PDT) Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by mx.google.com with ESMTPS id hi2si3605994wjc.149.2014.03.31.08.18.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:53 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.177 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.177; Received: by mail-we0-f177.google.com with SMTP id u57so4850936wes.22 for ; Mon, 31 Mar 2014 08:18:53 -0700 (PDT) X-Received: by 10.180.103.227 with SMTP id fz3mr13089107wib.29.1396279133449; Mon, 31 Mar 2014 08:18:53 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id wl6sm13547488wjb.3.2014.03.31.08.18.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:52 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Cc: devicetree@vger.kernel.org, Rob Herring , Ulf Hansson Subject: [PATCH V2 17/19] mmc: mmci: Enforce mmc capabilities through DT Date: Mon, 31 Mar 2014 17:18:18 +0200 Message-Id: <1396279100-2920-18-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396279100-2920-1-git-send-email-ulf.hansson@linaro.org> References: <1396279100-2920-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.128.175 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 4a3f582..601e816 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1524,8 +1524,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;