From patchwork Thu Apr 10 12:21:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 28181 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8329720671 for ; Thu, 10 Apr 2014 12:21:42 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id jt11sf12412183pbb.11 for ; Thu, 10 Apr 2014 05:21:41 -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=WC7kUkyhfhIElupMaBYmE1uKj/Si7Uj0ll8v3C6SRBo=; b=fuW7N/LDYKRnrdy0uRSQ2jK3wFe7pWqQBR7vxsq7ZPov3tUrysSKMPK5DbF8lExVyS Fb+TY4d5FZjfWN2nYIx/7OZdogbCeLYL4/Cbj077+9qMRvsRLBFzab3bxc9/FKi7y5zO xv28YiEfoNsAcFzYOpW2NHwjAPH3aFzcAYDw0X9gpb3UDYVmJXvMF2T2KrUYkNXfKpD/ oBAXZ2Dw2cJbXs8pMTWKIHyFuEkVQwq+l+Gk35vRL2HbKlFadX3fePuia+6AesnUEvYN MobXcFpy/oMTTNrwzHu7OUnjiequ5fT0dgFsGvMVSn2ufUz3nBJ/S78zEprJhQMANnJ0 gzkA== X-Gm-Message-State: ALoCoQnMtAglI8x2PSLbq4dFfgm2n6SsnSjrwWNHxPi+GkvhqLajMibro+qbEjErCt3iJvltOdPk X-Received: by 10.66.233.8 with SMTP id ts8mr7645353pac.38.1397132501812; Thu, 10 Apr 2014 05:21:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.244 with SMTP id f107ls1104067qgf.65.gmail; Thu, 10 Apr 2014 05:21:41 -0700 (PDT) X-Received: by 10.220.106.84 with SMTP id w20mr14297759vco.18.1397132501647; Thu, 10 Apr 2014 05:21:41 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id sw4si655709vdc.174.2014.04.10.05.21.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:41 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 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.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so3391642veb.31 for ; Thu, 10 Apr 2014 05:21:41 -0700 (PDT) X-Received: by 10.58.23.6 with SMTP id i6mr13956113vef.12.1397132501590; Thu, 10 Apr 2014 05:21:41 -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.221.72 with SMTP id ib8csp54597vcb; Thu, 10 Apr 2014 05:21:41 -0700 (PDT) X-Received: by 10.194.103.36 with SMTP id ft4mr1581057wjb.66.1397132500655; Thu, 10 Apr 2014 05:21:40 -0700 (PDT) Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by mx.google.com with ESMTPS id fy2si4278659wib.56.2014.04.10.05.21.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:40 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.174 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.174; Received: by mail-we0-f174.google.com with SMTP id t60so3913848wes.33 for ; Thu, 10 Apr 2014 05:21:40 -0700 (PDT) X-Received: by 10.194.189.80 with SMTP id gg16mr76207wjc.84.1397132500259; Thu, 10 Apr 2014 05:21:40 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ej7sm16437292wib.9.2014.04.10.05.21.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:39 -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 V3 17/19] mmc: mmci: Enforce mmc capabilities through DT Date: Thu, 10 Apr 2014 14:21:00 +0200 Message-Id: <1397132462-8005-18-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397132462-8005-1-git-send-email-ulf.hansson@linaro.org> References: <1397132462-8005-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.172 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 cac5f28..9a87bad 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1519,8 +1519,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;