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: 3873941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4448ABF540 for ; Fri, 21 Mar 2014 12:53:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC1FF2028D for ; Fri, 21 Mar 2014 12:53:06 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F34A220279 for ; Fri, 21 Mar 2014 12:53:04 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyPv-0000gH-Fo; Fri, 21 Mar 2014 12:19:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyP6-0003Z2-Ov; Fri, 21 Mar 2014 12:18:28 +0000 Received: from mail-la0-f46.google.com ([209.85.215.46]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyMP-0003J2-E1 for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 12:15:42 +0000 Received: by mail-la0-f46.google.com with SMTP id hr17so1564312lab.5 for ; Fri, 21 Mar 2014 05:15:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=20+GPVYhkY9LaSTsepzZ28+5xBYDLDRG8KQ2hJgGMwc=; b=SMDiIFacwQd0/Dw/0CPe5GwZ0YukhVqcnpWZlujAEpi7Ffw63f1ptX4RhCklXynh59 TfwTNwyNjOPxx0FRKrviGIl93RKVa167/+StAFtaZdhvCd0kBHoiO7cAmcmjMIOynBuH FUD4H6xnCbelmz85nem6l1KGTbdBLKYfHCLEZ9+DxcTy4f4vb8NMxw8fZBv6+1Rbxo/m MNmyO7VhhK40Cs+sPycImHmeBf3Z77HNurBj9EetbEWGHpHfk80gDtA2rlIWE0aLV2oO FlPx0x357uhTjrUmjWwbMCj+SrPIM2WBRv08jllXE1ka2Aj24oUpM4U/e37W3kOsJs8H CwBA== X-Gm-Message-State: ALoCoQn0sXaF5X0LBfCGll9TX0aUbjN3C+eFnWOkUMrJ73W4dmJ/bm8hfwlRe/o6Mnq1dIGVI57a 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140321_081541_687699_38C891E6 X-CRM114-Status: GOOD ( 14.21 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Ulf Hansson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 *);