From patchwork Fri Mar 21 12:14:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 26825 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E7C52203AB for ; Fri, 21 Mar 2014 12:15:21 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id fp1sf5285362pdb.8 for ; Fri, 21 Mar 2014 05:15:21 -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=20+GPVYhkY9LaSTsepzZ28+5xBYDLDRG8KQ2hJgGMwc=; b=LEIiVfJRSfcDzwDzofBp3c+q1ey6C+CImowK+Q4I7zxdCW9UWmv/Vw7h5AJljmlee9 VtkdLeYUaiQaUgCfLlKjYIwTvnYYlMp5puSkIre0xRzxIhNaB0Jo4366eaJ2oIQJ3NDa HO4ppnVo80zEeja3xdX9fnFhBkJVyMlxvdpYpDsr1TE8Rj6yy3D/F8zuoDetCAYxIYby NRA3fEvEaJG3KmeUrzsYIK10vBfj8YGww9NBfUrDODJEC20KK1eLrGa+9rk9q8gElcT4 xyUnsAuwt2iMOTYPzujQLl4sHntfyGMeXdiiey497KiPZ7kZJW+m5gaG6+PVce5oc7ov rwDQ== X-Gm-Message-State: ALoCoQnruNnC/y81BaktP5JC1M4hAsnb1v37NFUdZhPtg8UdCAGrZ/9jBC29ibxTfK2lPKhmuqs1 X-Received: by 10.66.66.163 with SMTP id g3mr19379720pat.3.1395404121183; Fri, 21 Mar 2014 05:15:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.198 with SMTP id h64ls628891qgf.84.gmail; Fri, 21 Mar 2014 05:15:21 -0700 (PDT) X-Received: by 10.52.139.6 with SMTP id qu6mr94979vdb.67.1395404121025; Fri, 21 Mar 2014 05:15:21 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id rx10si1115228vdc.96.2014.03.21.05.15.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.171 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.171; Received: by mail-ve0-f171.google.com with SMTP id cz12so2433420veb.16 for ; Fri, 21 Mar 2014 05:15:21 -0700 (PDT) X-Received: by 10.221.29.137 with SMTP id ry9mr37337966vcb.6.1395404120949; Fri, 21 Mar 2014 05:15:20 -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 i9csp26014vck; Fri, 21 Mar 2014 05:15:20 -0700 (PDT) X-Received: by 10.112.91.129 with SMTP id ce1mr1522513lbb.40.1395404119836; Fri, 21 Mar 2014 05:15:19 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by mx.google.com with ESMTPS id mv7si3698077lbc.88.2014.03.21.05.15.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:19 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.180 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id 10so1539213lbg.25 for ; Fri, 21 Mar 2014 05:15:19 -0700 (PDT) X-Received: by 10.112.13.101 with SMTP id g5mr1677434lbc.39.1395404119124; Fri, 21 Mar 2014 05:15:19 -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.17 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:18 -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 20/20] mmc: mmci: Enforce max frequency configuration through DT Date: Fri, 21 Mar 2014 13:14:17 +0100 Message-Id: <1395404057-27835-21-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.128.171 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 181445e..cbbb87e 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1475,13 +1475,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 *);