From patchwork Mon Aug 21 16:02:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 110563 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp4242396obb; Mon, 21 Aug 2017 09:03:20 -0700 (PDT) X-Received: by 10.84.128.195 with SMTP id a61mr19808436pla.222.1503331400642; Mon, 21 Aug 2017 09:03:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503331400; cv=none; d=google.com; s=arc-20160816; b=ejMo0wOg/UzPSOsKtyHUmNp3hcI6UrTfji0WyyYAiEus2fQpCbvgiKEJqWp51B9y2L /BEUeMjE1r0Qz1Q90UzWn7bkvqDCwbt7WgAHyTdAtq4MEmEpNx5lD/Okiz1oTfn/TJR2 44CDZz1M/WeNT44yG65br4t4Z/afs2z1Pp3uI/f7W9gGpJPdSF/eXhj5mLpEx37rGG0Z IqDxQHwBWN3Ay3oVUFNWeox/6skeD3EKUCV7hTXz2XL8ExuXhDHf3KQytzYnzYRuBYYF i89AkPTKMcVlLC7kFTAGiqLFPn7wlELQYvZOqzGvTDy2OwAHrPDm1P1RfgktymGLGBpk S5Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=hr+C/T8uNZUC2Q3WmJzHqYHhdk4t7v/kNGCjMEB0QHI=; b=OoyQ8c9vPz39GlBD+Z/eSBek6IMPFC3ukRJJetriT8n7DldEaPPlwQ4gsC1ywJwr9B AQ40iunLKiFZGkFKUhhmQ40ygygpCMWj02o7Jhbm3T1OLfifqYaDygwF8BvVI3s5MxSC PpM+WUV/NfzO4DfXYDmaGxOqC3Ar17GF5ycyHeF4nQ4bVPqFiiYU/P+Ltl78cncOKIDB Xym86cpdjMDhSvRcZ3XidC/wdVRZ/1y5H3Jr0NMzY+Q7W32pAiPGo9lak46s2o7OJohj jEOQ4PdMMt5/AsvSv3KWNgltDZxY4UJXx/ceQA2ydvkXoI6gr7G7Oi734hvypBfr0dU6 QMDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=HmcpJvfZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h69si5160309pge.830.2017.08.21.09.03.20; Mon, 21 Aug 2017 09:03:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=HmcpJvfZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754475AbdHUQDS (ORCPT + 26 others); Mon, 21 Aug 2017 12:03:18 -0400 Received: from mail-wr0-f174.google.com ([209.85.128.174]:38257 "EHLO mail-wr0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754457AbdHUQDO (ORCPT ); Mon, 21 Aug 2017 12:03:14 -0400 Received: by mail-wr0-f174.google.com with SMTP id p8so39039902wrf.5 for ; Mon, 21 Aug 2017 09:03:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hr+C/T8uNZUC2Q3WmJzHqYHhdk4t7v/kNGCjMEB0QHI=; b=HmcpJvfZVk0kqQEzHqxtw+5SjsiYldI2svTrQr9BNsDLFvgU2N5hkJ0uVwL7xoBM1H ZiEakHIDhXdXeNNXSNDxOmaLDMsruj+u8LvPEpRKr12UEkvk8tAoVTlTlZFElZmJVKzx +REPoArnMC5ZS6UV2gzVpOkzq8zcIjZQAVH1F+m4wIKGeLf41SKyxfjdXcPEAHosoBTj jgly74dPyJxPCrVLBOUtKRI0/poBiJkgRXsqnlzK1+W7RpEHWLilCdtTTBiz4OkINBa5 k0qDQ1sjkCCVmRz+YdETN0IbX92oRd6Fil6wUBbRjJLP/1JhUwjV/riFRdM499U2Be4C pz4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hr+C/T8uNZUC2Q3WmJzHqYHhdk4t7v/kNGCjMEB0QHI=; b=tLLidYPdaPUdKvVWr4M9kS1l+NAndAoYdM+10D+s/H/zC0TiW1Vx6B8WS2cpPfzqu+ +EbFQd+eOj4UcceigH4iwNS0lihY7mrSvpW/RpvjpvRC8j0p3GvOfbKpqOJBRpQJRXia BfOOIPrWjELSjDkQSOqIp0VE7DAgAZ9p9IqHrNvfgUbiWHHCHWNStu1Ii2KHhzsRr8p5 TyRL3P2iNTFGsDqcq0waX93dml16EjQwHecDCoAO4rR+SP80kBVhjxht4LaGQFscgY7G E2aK/lNd1luj9ESNRvGGNo+Hom8bUIjjcosKrPKrVmOlJ66wSEv1C/qj5o0/QIPjcEyV 7nVQ== X-Gm-Message-State: AHYfb5iaYHW4LafufF7vg1ohMWTgm+yMbzB3aAYdhs57a/xBfIru/oal /WXWTCpG3x47tSvi X-Received: by 10.223.195.210 with SMTP id d18mr6416689wrg.30.1503331393115; Mon, 21 Aug 2017 09:03:13 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id 63sm8120063wra.30.2017.08.21.09.03.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Aug 2017 09:03:12 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 07/16] mmc: meson-gx: rework clk_set function Date: Mon, 21 Aug 2017 18:02:52 +0200 Message-Id: <20170821160301.21899-8-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170821160301.21899-1-jbrunet@baylibre.com> References: <20170821160301.21899-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Clean-up clk_set function to prepare the next changes (DDR and clk-stop) Reviewed-by: Kevin Hilman Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) -- 2.9.5 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 18fff28025d8..8f9ba5190c18 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -139,7 +139,7 @@ struct meson_host { struct clk *core_clk; struct clk_mux mux; struct clk *mux_clk; - unsigned long current_clock; + unsigned long req_rate; struct clk_divider cfg_div; struct clk *cfg_div_clk; @@ -275,29 +275,18 @@ static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate) int ret; u32 cfg; - if (clk_rate) { - if (WARN_ON(clk_rate > mmc->f_max)) - clk_rate = mmc->f_max; - else if (WARN_ON(clk_rate < mmc->f_min)) - clk_rate = mmc->f_min; - } - - if (clk_rate == host->current_clock) + /* Same request - bail-out */ + if (host->req_rate == clk_rate) return 0; /* stop clock */ cfg = readl(host->regs + SD_EMMC_CFG); - if (!(cfg & CFG_STOP_CLOCK)) { - cfg |= CFG_STOP_CLOCK; - writel(cfg, host->regs + SD_EMMC_CFG); - } - - dev_dbg(host->dev, "change clock rate %u -> %lu\n", - mmc->actual_clock, clk_rate); + cfg |= CFG_STOP_CLOCK; + writel(cfg, host->regs + SD_EMMC_CFG); + host->req_rate = 0; if (!clk_rate) { mmc->actual_clock = 0; - host->current_clock = 0; /* return with clock being stopped */ return 0; } @@ -309,13 +298,12 @@ static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate) return ret; } + host->req_rate = clk_rate; mmc->actual_clock = clk_get_rate(host->cfg_div_clk); - host->current_clock = clk_rate; + dev_dbg(host->dev, "clk rate: %u Hz\n", mmc->actual_clock); if (clk_rate != mmc->actual_clock) - dev_dbg(host->dev, - "divider requested rate %lu != actual rate %u\n", - clk_rate, mmc->actual_clock); + dev_dbg(host->dev, "requested rate was %lu\n", clk_rate); /* (re)start clock */ cfg = readl(host->regs + SD_EMMC_CFG);