From: viresh.kumar@st•com (Viresh Kumar)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH V3 2/8] clk: add a fixed factor clock
Date: Thu, 3 May 2012 11:02:41 +0530 [thread overview]
Message-ID: <4FA21879.9060508@st.com> (raw)
In-Reply-To: <20120502224108.GC18402@gmail.com>
On 5/3/2012 4:11 AM, Mike Turquette wrote:
> I will take this patch in before sending my request to Arnd. In your
> patch 0/8 you ask me to take in the series, but it looks like not all of
> the patches are going through me. For instance patch 2/8 certainly
> looks destined for Russell.
I think you only need to take this patch, i.e. 2/8.
Others will go through Arnd directly, keeping your branch as an dependency
branch for it.
> After fixing up this patch can you resend a clean series which is only
> headed for clk-next?
So, i would be sending this patch only after applying the last fixup
(hopefully :) ).
@Sascha: Please see if this patch is sufficient.
---
drivers/clk/clk-fixed-factor.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index 9afbdc4..8d25c2e 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -37,16 +37,15 @@ static long clk_factor_round_rate(struct clk_hw *hw, unsigned long rate,
{
struct clk_fixed_factor *fix = to_clk_fixed_factor(hw);
- if (prate) {
+ if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) {
unsigned long best_parent;
+
best_parent = (rate / fix->mult) * fix->div;
*prate = __clk_round_rate(__clk_get_parent(hw->clk),
best_parent);
- return (*prate / fix->div) * fix->mult;
- } else {
- return (__clk_get_rate(__clk_get_parent(hw->clk)) / fix->div) *
- fix->mult;
}
+
+ return (*prate / fix->div) * fix->mult;
}
static int clk_factor_set_rate(struct clk_hw *hw, unsigned long rate,
--
viresh
next prev parent reply other threads:[~2012-05-03 5:32 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-24 6:50 [PATCH V3 0/8] SPEAr: Move to common clock framework Viresh Kumar
2012-04-24 6:50 ` [PATCH V3 1/8] CLKDEV: Add helper routines to allocate and add clkdevs for given struct clk * Viresh Kumar
2012-04-26 7:47 ` Russell King - ARM Linux
2012-04-26 10:28 ` Viresh Kumar
2012-04-28 9:52 ` Russell King - ARM Linux
2012-04-28 11:01 ` Sascha Hauer
2012-04-28 11:06 ` Russell King - ARM Linux
2012-05-01 8:45 ` Viresh Kumar
2012-05-01 12:31 ` Shawn Guo
2012-05-02 9:54 ` Russell King - ARM Linux
2012-05-02 13:59 ` Shawn Guo
2012-05-02 14:13 ` Russell King - ARM Linux
2012-04-30 8:08 ` Viresh Kumar
2012-04-24 6:50 ` [PATCH V3 2/8] clk: add a fixed factor clock Viresh Kumar
2012-04-27 4:43 ` Viresh Kumar
2012-05-02 9:48 ` Sascha Hauer
2012-05-02 11:56 ` Viresh Kumar
2012-05-02 22:41 ` Mike Turquette
2012-05-02 22:44 ` Mike Turquette
2012-05-02 23:31 ` Russell King - ARM Linux
2012-05-03 5:32 ` Viresh Kumar [this message]
2012-05-03 6:37 ` Sascha Hauer
2012-05-03 9:48 ` Viresh Kumar
2012-04-24 6:50 ` [PATCH V3 3/8] SPEAr: clk: Add VCO-PLL Synthesizer clock Viresh Kumar
2012-04-27 4:44 ` Viresh Kumar
2012-05-03 5:47 ` Viresh Kumar
2012-05-03 9:49 ` Viresh Kumar
2012-04-24 6:50 ` [PATCH V3 4/8] SPEAr: clk: Add Auxiliary " Viresh Kumar
2012-04-27 4:45 ` Viresh Kumar
2012-05-03 5:47 ` Viresh Kumar
2012-05-03 9:50 ` Viresh Kumar
2012-04-24 6:50 ` [PATCH V3 5/8] SPEAr: clk: Add Fractional " Viresh Kumar
2012-04-27 4:45 ` Viresh Kumar
2012-05-03 5:46 ` Viresh Kumar
2012-05-03 9:51 ` Viresh Kumar
2012-04-24 6:50 ` [PATCH V3 6/8] SPEAr: clk: Add General Purpose Timer " Viresh Kumar
2012-04-27 4:46 ` Viresh Kumar
2012-05-03 5:43 ` Viresh Kumar
2012-05-03 9:51 ` Viresh Kumar
2012-04-24 6:50 ` [PATCH V3 7/8] SPEAr: Call clk_prepare() before calling clk_enable Viresh Kumar
2012-04-27 4:42 ` [PATCH V3 0/8] SPEAr: Move to common clock framework Viresh Kumar
2012-04-27 17:50 ` Turquette, Mike
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FA21879.9060508@st.com \
--to=viresh.kumar@st$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox