From patchwork Mon Feb 12 20:13:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 10214383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 41A2B60153 for ; Mon, 12 Feb 2018 20:15:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A05F28CC8 for ; Mon, 12 Feb 2018 20:15:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C09028D12; Mon, 12 Feb 2018 20:15:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5B18728CC8 for ; Mon, 12 Feb 2018 20:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=O/f9fXzdYJ3aEPmo7y32+ILFGM/jgMikyN0gTxyzzhk=; b=lejcETvmI6ojEJw4n/KNXe478m 4BWzwT2sVpaELaXyTY946ljO9B3EdvfkWQYYIM5IVL1NufMBv6V7vomSma8pJqcOmFaAjFJU+LQcS z9otxhhz782KgBe39peqwXbQFajtbf070tRk8dMMPK3Rws3fIMT/89rehUwi1KX4gqn/r0edpiLMn wGiK7N4P92FxGOkV+yez/XGLtjzMq2tHLq72kwq31tWj7G7VKdALfR/D7du1Fu+Ezg5sQ9r0MNXOi Kayv3D3gLSv924vUFMg+pLIclK3OIyNcxNyzrxRXNyEaF4aK653yNfiY1n1uJ4bo+efN08PWuOrsg WRedRQXQ==; Received: from [198.137.202.133] (helo=bombadil.infradead.org) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elKVm-0002z7-1l for patchwork-linux-arm@patchwork.kernel.org; Mon, 12 Feb 2018 20:15:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=O/f9fXzdYJ3aEPmo7y32+ILFGM/jgMikyN0gTxyzzhk=; b=p7J j378ECXFCZvDv9bFae9gpYR7iuRYbwhyWGBea0mmCGdE2z2sWUcoGdSnFET18PBa5H1DXFKtFP5I3 ioVB2Vu/rXriILimIqcK9a/hSNQTimhp75osa1SpMBQTjBuZPu42DPYNVbzIOSxtnE3G0FV+RZyF4 7mWhBEN68HZtsXeFBKgYCTojje6J2e0gHwJauz7wsiIkKzvgMRLkIr69gp2ustI/7NEMxtv+yADiM 8xNVgjTKsBq1ItirGvtp42yV1rDLYJrATPnk+ijoAQbpj4GYe2EQjnvRSWAUoEZe/bk7cov/CGhTS XMQmgzPd2FnICqe2SmDxREAF1XinodA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1elKUa-0000YB-Mi; Mon, 12 Feb 2018 20:14:24 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elKUX-0008U1-OL for linux-arm-kernel@lists.infradead.org; Mon, 12 Feb 2018 20:14:23 +0000 Received: from localhost.localdomain ([95.90.209.156]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M7Fkw-1eZYR22HRO-00x4X6; Mon, 12 Feb 2018 21:14:02 +0100 From: Stefan Wahren To: Ulf Hansson Subject: [PATCH] mmc: bcm2835: Don't overwrite max frequency unconditionally Date: Mon, 12 Feb 2018 21:13:44 +0100 Message-Id: <1518466424-30229-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 X-Provags-ID: V03:K0:92dBSC0M9Dyp9TBA4rMykUrFg1Ixo698J3rkoJ9gPolqqQNBo5F 9O11UbZJ4NbBmp7HX9S/LF5aKEEKCs19VfZfi2Ldz2hWQBCBO7KT/gDbfmjABLhqVejNksU BF3K8IFdv/0BMSZglwXGjRht4XL+6EOUJWcQHudYc8prf9Q3hYTpmV9T44zxU3RN6DP+M1C Xj/T19eByx1dlW3aGQugg== X-UI-Out-Filterresults: notjunk:1; V01:K0:cNpYAIHxSFU=:h/KrPq/j91tEkBEysbzOyu 4vaI0MmY8WL7SyoixEoWAgUgYd/rN3YnMx+4lpiVCLo96wsAtlBqO/6g1CdnHuSTnF49Wsf1a WmepNZ3jYqOw5xKGclpn6qqvKidAW/drG8JHYfDDNqrKdctwVEZMz3szS2ju/kxJ3MEMYA44u OYP7Qn0KPCIFik6HdTY2Xa05/PZ9jE+omwfn/ceUXEsNGwJby+imUOUdkz/X++U9MtF0CcEPk npKWIpDaYUEBMeZ0gmtd0zPU5ym1hSyTa3boNkCUc6XlMolMf82cWSKBOxcGeNJ0087nXTu3h l0zHP+2ngdIE5uOt5pNYxrv5ovNM01djLwzY+GHG4GbumvEFxMuxSKKpubxMFLGwm3/y3kFuT b44swAaNcvjgcH1+bpSmqto8MiHgLGkETB/lEISvI8qxFLbYwOs3+wTt/GmDYAIYWit5Vpu/X cQ8OV+yj8REHSF6SOzOoCw7Kx0dDizp7PBAjhnbtj25tgGr8+mTPsKgoOvX5ToQPUI1w4ZzWi KzjFnRGCKO4vs6XLdHJ+0IFBZkgx4+sfKrv8Qw6wKLKqgVWN2bRAydY+yXTKYCt/uLVy2Ux1Y QS3FdM5udWAAtkvV0J6hu0X3aiVxMudaCovbWRZFGutbj+5nrMOe5O6rX9dsqNNr+fq2uWWFL vGQhbMpy1+ySXRRgGnW2YAYGZ19HJD9RD7uF7iTG3gm5HKSo7/kfGg3adbvAOx3CHghYxQTjd G5CClostgOvnpqBcbyuvYASFqgoDff/EiTP4B3CCywjn1a2+Mq1aQ1bRrCw= X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , Scott Branden , Jon Mason , Ray Jui , linux-mmc@vger.kernel.org, Eric Anholt , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Phil Elwell The optional DT parameter max-frequency could init the max bus frequency. So take care of this, before setting the max bus frequency. Fixes: 660fc733bd74 ("mmc: bcm2835: Add new driver for the sdhost controller.") Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- drivers/mmc/host/bcm2835.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index 229dc18..768972a 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -1265,7 +1265,8 @@ static int bcm2835_add_host(struct bcm2835_host *host) char pio_limit_string[20]; int ret; - mmc->f_max = host->max_clk; + if (!mmc->f_max || mmc->f_max > host->max_clk) + mmc->f_max = host->max_clk; mmc->f_min = host->max_clk / SDCDIV_MAX_CDIV; mmc->max_busy_timeout = ~0 / (mmc->f_max / 1000);