From patchwork Tue Feb 7 21:34:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9561251 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 8FEFA602B1 for ; Tue, 7 Feb 2017 21:45:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8150928461 for ; Tue, 7 Feb 2017 21:45:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7504D2847B; Tue, 7 Feb 2017 21:45:13 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1487828461 for ; Tue, 7 Feb 2017 21:45:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932502AbdBGVpM (ORCPT ); Tue, 7 Feb 2017 16:45:12 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35893 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932176AbdBGVpL (ORCPT ); Tue, 7 Feb 2017 16:45:11 -0500 Received: by mail-wr0-f193.google.com with SMTP id k90so6678415wrc.3 for ; Tue, 07 Feb 2017 13:45:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=+ImvYPf5YVgf4Aus2fDoL7GvyYANwXcfVmgMtR7puog=; b=dWnZVWQ/nDAWDwZP8wMLiDsOetMJJ1Otye0d8zX3RcXL8CAkZwJFaEoaU2KVp3S6n5 RlTnoMy24JH+uta1uVdx3YkNcEPu66+SmFo0b8YxfHln5Pwi6aQRljSBu3JnaNcRafMm 69x5SHK56R2J23tTEODng0+++BN1u3YUeeB9NQK0stZ2K10XacohYFQvafoZi/9J0h0X oV32kyyUT+xavLiatxWa2OGJomcgIOoBqDdVF3XX3qRd/O5FyAMn/RF2WdlB3BBJQPHj ZlmeQecZJeheJ9NUwHR6KVZeiUiM9vbguPfLUhKJJrzDSI4QxLj1rc5ti+aKF59s8f+L C/GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=+ImvYPf5YVgf4Aus2fDoL7GvyYANwXcfVmgMtR7puog=; b=hvLvBI+UH2GlgQW2eruAjUcRyd0VbKOzu9MpifQYcFYTQMob/8zb6AHDiTS/4+Wvoq Xcv3545WPPg0s0UfC527DPw6h8OogNDdRYz2IgZsTeHNUpVpAGiZdpbqweJG1I1yv1Sl dRdsG0B+7eLWD7sPJuz/I6XFzNOTKzDIvJm4O/tOOcWEJJHl8X007wzNGidssEqtliys 12h163Omif7SswFA0mxrBkBR0MfTbGYCqngngXABK+TsVSEcB1pNF/fq5J2wMR4jFDSO XN8AEkOYHzvs2cai8XBsTzPV9NXLNU/5fgLYQVemO+zoXxAxs4FDDMqfEMVggB+sKBe9 n8ag== X-Gm-Message-State: AIkVDXIA6FqvHfm3kkcszGneL9FeE9r4S7RcxneYUXP1kkF77YFkZhrtwQRKZjRiJwK3pg== X-Received: by 10.223.139.213 with SMTP id w21mr15900462wra.108.1486503375164; Tue, 07 Feb 2017 13:36:15 -0800 (PST) Received: from ?IPv6:2003:c6:ebce:1e00:cd3f:c3c7:98c5:4fec? (p200300C6EBCE1E00CD3FC3C798C54FEC.dip0.t-ipconnect.de. [2003:c6:ebce:1e00:cd3f:c3c7:98c5:4fec]) by smtp.googlemail.com with ESMTPSA id v128sm692947wmv.2.2017.02.07.13.36.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Feb 2017 13:36:14 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v3 3/9] mmc: meson-gx: improve meson_mmc_clk_set To: Ulf Hansson , Kevin Hilman References: <0991d40b-e05b-2fcb-9ee4-7b529448de69@gmail.com> Cc: Carlo Caione , "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org Message-ID: <34ea9c0b-a39c-93ac-a626-d07e45fe4ab2@gmail.com> Date: Tue, 7 Feb 2017 22:34:32 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <0991d40b-e05b-2fcb-9ee4-7b529448de69@gmail.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The following changes are quite small, therefore I combined them in one patch. - ret doesn't need to be initialized with 0 - use standard !clk_rate notation to check for a zero value - If clk_rate is zero we return here. Therefore all further checks in this function for clk_rate != 0 are not needed. - switch from dev_warn to dev_err if the clock can't be set - If due to clock source and available divider values the requested frequency isn't matched exactly (always the case if requested frequency is 52 MHz), then just print the differing values as debug message and not as warning. - Also remove ret from the message as it is always 0. - Set member current_clock to the current requested rate and mmc->actual_clock to the current actual rate Signed-off-by: Heiner Kallweit --- v3: - Introduce member current_clock to store the current requested rate - Use mmc->actual_clock to store the actual rate --- drivers/mmc/host/meson-gx-mmc.c | 42 +++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 9d79df7c..d6a4dfae 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -132,6 +132,7 @@ struct meson_host { struct clk_mux mux; struct clk *mux_clk; struct clk *mux_parent[MUX_CLK_NUM_PARENTS]; + unsigned long current_clock; struct clk_divider cfg_div; struct clk *cfg_div_clk; @@ -178,7 +179,7 @@ struct sd_emmc_desc { static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate) { struct mmc_host *mmc = host->mmc; - int ret = 0; + int ret; u32 cfg; if (clk_rate) { @@ -188,7 +189,7 @@ static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate) clk_rate = mmc->f_min; } - if (clk_rate == mmc->actual_clock) + if (clk_rate == host->current_clock) return 0; /* stop clock */ @@ -201,29 +202,34 @@ static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate) dev_dbg(host->dev, "change clock rate %u -> %lu\n", mmc->actual_clock, clk_rate); - if (clk_rate == 0) { + if (!clk_rate) { mmc->actual_clock = 0; + host->current_clock = 0; + /* return with clock being stopped */ return 0; } ret = clk_set_rate(host->cfg_div_clk, clk_rate); - if (ret) - dev_warn(host->dev, "Unable to set cfg_div_clk to %lu. ret=%d\n", - clk_rate, ret); - else if (clk_rate && clk_rate != clk_get_rate(host->cfg_div_clk)) - dev_warn(host->dev, "divider requested rate %lu != actual rate %lu: ret=%d\n", - clk_rate, clk_get_rate(host->cfg_div_clk), ret); - else - mmc->actual_clock = clk_rate; - - /* (re)start clock, if non-zero */ - if (!ret && clk_rate) { - cfg = readl(host->regs + SD_EMMC_CFG); - cfg &= ~CFG_STOP_CLOCK; - writel(cfg, host->regs + SD_EMMC_CFG); + if (ret) { + dev_err(host->dev, "Unable to set cfg_div_clk to %lu. ret=%d\n", + clk_rate, ret); + return ret; } - return ret; + mmc->actual_clock = clk_get_rate(host->cfg_div_clk); + host->current_clock = clk_rate; + + if (clk_rate != mmc->actual_clock) + dev_dbg(host->dev, + "divider requested rate %lu != actual rate %u\n", + clk_rate, mmc->actual_clock); + + /* (re)start clock */ + cfg = readl(host->regs + SD_EMMC_CFG); + cfg &= ~CFG_STOP_CLOCK; + writel(cfg, host->regs + SD_EMMC_CFG); + + return 0; } /*