From patchwork Thu Apr 10 12:21:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 28183 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 2D2A320671 for ; Thu, 10 Apr 2014 12:21:45 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kq14sf12662384pab.2 for ; Thu, 10 Apr 2014 05:21:45 -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=aCjFzj06f8gA8i59Yc4Bo4oZ1MZD6ltsNJE8WBhgN60=; b=SQDmmd6Tr8FP7xBpfK+40ql/IaJa+zn3MVfBbJTzX/MYag+1S1vp/Vn75CgROf4BpE ofkVBqWMX9RL8lMPBFJo+P+fB+VrTHLvD9rge+p2/95UkB/d2dcO+lRz1SDohkaFAilH B36xejTtDcA77Igin81bUQZEpxdlgTibMenWbTmsdSyv7/wC8FagoZGLaF34KZZ7y+M8 LP7LV3j9/9iwGKRzdVV9f+PToKt0oArsQS/u1ZKbL68NhtB7VzC09WKjGwr/wwP+I/CE m/PyopUo4YRcGTexlLeRrnj0vudPCvr4OPMwCWWWn/PwYCAVL6GUCSu8/gxoydqXReT6 BRdQ== X-Gm-Message-State: ALoCoQl4QJF/eJKeFQ3wVl1B51ASxw7rVaWSj+neSyVHnE9ip3r8MphUbWPEHYBjJueYyu2V4ADR X-Received: by 10.68.133.75 with SMTP id pa11mr8000924pbb.2.1397132505334; Thu, 10 Apr 2014 05:21:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.70 with SMTP id n64ls930030qga.19.gmail; Thu, 10 Apr 2014 05:21:45 -0700 (PDT) X-Received: by 10.58.105.105 with SMTP id gl9mr14012111veb.3.1397132505176; Thu, 10 Apr 2014 05:21:45 -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 qr10si657228vcb.189.2014.04.10.05.21.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:45 -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 jx11so3401256veb.3 for ; Thu, 10 Apr 2014 05:21:45 -0700 (PDT) X-Received: by 10.58.202.133 with SMTP id ki5mr13802979vec.19.1397132505115; Thu, 10 Apr 2014 05:21:45 -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 ib8csp54606vcb; Thu, 10 Apr 2014 05:21:44 -0700 (PDT) X-Received: by 10.180.84.129 with SMTP id z1mr1299032wiy.8.1397132503957; Thu, 10 Apr 2014 05:21:43 -0700 (PDT) Received: from mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) by mx.google.com with ESMTPS id l8si269682wiz.74.2014.04.10.05.21.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:43 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.169 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.169; Received: by mail-we0-f169.google.com with SMTP id w62so3887021wes.0 for ; Thu, 10 Apr 2014 05:21:43 -0700 (PDT) X-Received: by 10.181.13.82 with SMTP id ew18mr14997438wid.22.1397132503359; Thu, 10 Apr 2014 05:21:43 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ej7sm16437292wib.9.2014.04.10.05.21.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 05:21:42 -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 19/19] mmc: mmci: Enforce max frequency configuration through DT Date: Thu, 10 Apr 2014 14:21:02 +0200 Message-Id: <1397132462-8005-20-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 a maximum frequency as platform data, enforce it through DT. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 5 +---- include/linux/amba/mmci.h | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 04cff5e..83f5e56 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1478,13 +1478,10 @@ static int mmci_probe(struct amba_device *dev, * If no maximum operating frequency is supplied, fall back to use * the module parameter, which has a (low) default value in case it * is not specified. Either value must not exceed the clock rate into - * the block, of course. Also note that DT takes precedence over - * platform data. + * the block, of course. */ if (mmc->f_max) mmc->f_max = min(host->mclk, mmc->f_max); - else if (plat->f_max) - mmc->f_max = min(host->mclk, plat->f_max); else mmc->f_max = min(host->mclk, fmax); dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index bf339ff..8c98113 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -9,9 +9,6 @@ /** * struct mmci_platform_data - platform configuration for the MMCI * (also known as PL180) block. - * @f_max: the maximum operational frequency for this host in this - * platform configuration. When this is specified it takes precedence - * over the module parameter for the same frequency. * @ocr_mask: available voltages on the 4 pins from the block, this * is ignored if a regulator is used, see the MMC_VDD_* masks in * mmc/host.h @@ -28,7 +25,6 @@ * @cd_invert: true if the gpio_cd pin value is active low */ struct mmci_platform_data { - unsigned int f_max; unsigned int ocr_mask; int (*ios_handler)(struct device *, struct mmc_ios *); unsigned int (*status)(struct device *);