From patchwork Mon Mar 31 15:18:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 27479 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 86D00202E0 for ; Mon, 31 Mar 2014 15:18:58 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f10sf20948072yha.7 for ; Mon, 31 Mar 2014 08:18:58 -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=R5/89CNxTqg4kuw9ZCgnYmT3ky+5fVf9YAtFYb3huUE=; b=YlY7OnAg7eJumRto5ctIONXcbs79Rnq7VSm3YM9jzxdgS0mB6kUJOSkNbW5+JdsPNK kGvIAJ4LPYG1arZ9vj1LoifGMoitJfHxaMpV691I36NBaDXaDT5Uu2BlzRcIlxg9zBMT lZ7594MtzTIWOuoT2oyX44m7DRx9cS0FfjoyrWvrtAAzCsCFngsyu+XmXjNxExk3eH8w GlOUhYD/oCG4rEh/8nNUQWNiQCg8vWEpf9sGtMp7A7s8U+/eodk0Qb9ml7mZBKnGqDPf gzLscTpQoLWxj7kEY9EhNO3+48aVqrWyksrZPveNquenopFoMWeiclTvNmlXTAn0phwG dAmw== X-Gm-Message-State: ALoCoQkF+sCZhCjBBpRuvKTwTNTRQOylYLRhnBaCpg0E7C8eno2ZgODzJAU1LGbvzc30jS2Ct2Ko X-Received: by 10.59.10.40 with SMTP id dx8mr9329472ved.26.1396279138299; Mon, 31 Mar 2014 08:18:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.213 with SMTP id 79ls2337725qgl.35.gmail; Mon, 31 Mar 2014 08:18:58 -0700 (PDT) X-Received: by 10.220.139.198 with SMTP id f6mr47330vcu.47.1396279138219; Mon, 31 Mar 2014 08:18:58 -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 ej2si3031657veb.41.2014.03.31.08.18.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:58 -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 jx11so8361714veb.31 for ; Mon, 31 Mar 2014 08:18:58 -0700 (PDT) X-Received: by 10.59.7.102 with SMTP id db6mr8276369ved.17.1396279138158; Mon, 31 Mar 2014 08:18:58 -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 v8csp150824vcv; Mon, 31 Mar 2014 08:18:57 -0700 (PDT) X-Received: by 10.180.187.16 with SMTP id fo16mr13106466wic.26.1396279136977; Mon, 31 Mar 2014 08:18:56 -0700 (PDT) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by mx.google.com with ESMTPS id qk5si3605342wjc.30.2014.03.31.08.18.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.174 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.212.174; Received: by mail-wi0-f174.google.com with SMTP id d1so3519900wiv.1 for ; Mon, 31 Mar 2014 08:18:56 -0700 (PDT) X-Received: by 10.194.109.6 with SMTP id ho6mr15409559wjb.21.1396279136385; Mon, 31 Mar 2014 08:18:56 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id wl6sm13547488wjb.3.2014.03.31.08.18.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:55 -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 19/19] mmc: mmci: Enforce max frequency configuration through DT Date: Mon, 31 Mar 2014 17:18:20 +0200 Message-Id: <1396279100-2920-20-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.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 5cb5a81..3e4bfec 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1483,13 +1483,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 *);