From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Boyd Subject: Re: [PATCH v5 2/4] clk: qcom: Add support for RCGs with shared branches Date: Thu, 17 Sep 2015 12:31:37 -0700 Message-ID: <20150917193137.GU23081@codeaurora.org> References: <1442507969-18062-1-git-send-email-georgi.djakov@linaro.org> <1442507969-18062-3-git-send-email-georgi.djakov@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from smtp.codeaurora.org ([198.145.29.96]:37552 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868AbbIQTbi (ORCPT ); Thu, 17 Sep 2015 15:31:38 -0400 Content-Disposition: inline In-Reply-To: <1442507969-18062-3-git-send-email-georgi.djakov@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Georgi Djakov Cc: mturquette@baylibre.com, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org On 09/17, Georgi Djakov wrote: > + > +static unsigned long > +clk_rcg2_shared_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) > +{ > + struct clk_rcg2 *rcg = to_clk_rcg2(hw); > + unsigned long rate; > + u32 cfg, hid_div, mask; > + > + regmap_read(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG, &cfg); > + > + mask = BIT(rcg->hid_width) - 1; > + hid_div = cfg >> CFG_SRC_DIV_SHIFT; > + hid_div &= mask; > + > + rate = (parent_rate * 2) / (hid_div + 1); > + > + rcg->current_freq = rate; > + We didn't need to copy/paste/hack the clk_rcg2_recalc_rate() code. I squashed this in. diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c index c7b9b32742e5..b544bb302f79 100644 --- a/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c @@ -350,20 +350,8 @@ static unsigned long clk_rcg2_shared_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { struct clk_rcg2 *rcg = to_clk_rcg2(hw); - unsigned long rate; - u32 cfg, hid_div, mask; - regmap_read(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG, &cfg); - - mask = BIT(rcg->hid_width) - 1; - hid_div = cfg >> CFG_SRC_DIV_SHIFT; - hid_div &= mask; - - rate = (parent_rate * 2) / (hid_div + 1); - - rcg->current_freq = rate; - - return rate; + return rcg->current_freq = clk_rcg2_recalc_rate(hw, parent_rate); } static int clk_rcg2_shared_enable(struct clk_hw *hw) -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project