From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>, Chen-Yu Tsai <wens@csie.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-sunxi@googlegroups.com
Subject: [PATCH v2 1/20] clk: divider: Make divider_round_rate take the parent clock
Date: Wed, 3 May 2017 13:59:38 +0200 [thread overview]
Message-ID: <9c2f3ed66ae32e55721bfced41dfd70e49cb746c.1493812478.git-series.maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <cover.d697f34bb7b0605c5e76cbc4167a64453e5e0984.1493812478.git-series.maxime.ripard@free-electrons.com>
In-Reply-To: <cover.d697f34bb7b0605c5e76cbc4167a64453e5e0984.1493812478.git-series.maxime.ripard@free-electrons.com>
So far, divider_round_rate only considers the parent clock returned by
clk_hw_get_parent.
This works fine on clocks that have a single parents, this doesn't work on
muxes, since we will only consider the first parent, while other parents
may totally be able to provide a better combination.
Clocks in that case cannot use divider_round_rate, so would have to come up
with a very similar logic to work around it. Instead of having to do
something like this, and duplicate that logic everywhere, create a
divider_round_rate parent to allow caller to give an additional parameter
for the parent clock to consider.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/clk/clk-divider.c | 26 ++++++++++++++++++--------
include/linux/clk-provider.h | 4 ++++
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 96386ffc8483..48750439b1cd 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -275,7 +275,8 @@ static int _next_div(const struct clk_div_table *table, int div,
return div;
}
-static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,
+static int clk_divider_bestdiv(struct clk_hw *hw, struct clk_hw *parent,
+ unsigned long rate,
unsigned long *best_parent_rate,
const struct clk_div_table *table, u8 width,
unsigned long flags)
@@ -314,8 +315,7 @@ static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,
*best_parent_rate = parent_rate_saved;
return i;
}
- parent_rate = clk_hw_round_rate(clk_hw_get_parent(hw),
- rate * i);
+ parent_rate = clk_hw_round_rate(parent, rate * i);
now = DIV_ROUND_UP_ULL((u64)parent_rate, i);
if (_is_best_div(rate, now, best, flags)) {
bestdiv = i;
@@ -326,22 +326,32 @@ static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,
if (!bestdiv) {
bestdiv = _get_maxdiv(table, width, flags);
- *best_parent_rate = clk_hw_round_rate(clk_hw_get_parent(hw), 1);
+ *best_parent_rate = clk_hw_round_rate(parent, 1);
}
return bestdiv;
}
-long divider_round_rate(struct clk_hw *hw, unsigned long rate,
- unsigned long *prate, const struct clk_div_table *table,
- u8 width, unsigned long flags)
+long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent,
+ unsigned long rate, unsigned long *prate,
+ const struct clk_div_table *table,
+ u8 width, unsigned long flags)
{
int div;
- div = clk_divider_bestdiv(hw, rate, prate, table, width, flags);
+ div = clk_divider_bestdiv(hw, parent, rate, prate, table, width, flags);
return DIV_ROUND_UP_ULL((u64)*prate, div);
}
+EXPORT_SYMBOL_GPL(divider_round_rate_parent);
+
+long divider_round_rate(struct clk_hw *hw, unsigned long rate,
+ unsigned long *prate, const struct clk_div_table *table,
+ u8 width, unsigned long flags)
+{
+ return divider_round_rate_parent(hw, clk_hw_get_parent(hw), rate, prate,
+ table, width, flags);
+}
EXPORT_SYMBOL_GPL(divider_round_rate);
static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index a428aec36ace..14102f783f64 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -412,6 +412,10 @@ extern const struct clk_ops clk_divider_ro_ops;
unsigned long divider_recalc_rate(struct clk_hw *hw, unsigned long parent_rate,
unsigned int val, const struct clk_div_table *table,
unsigned long flags);
+long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent,
+ unsigned long rate, unsigned long *prate,
+ const struct clk_div_table *table,
+ u8 width, unsigned long flags);
long divider_round_rate(struct clk_hw *hw, unsigned long rate,
unsigned long *prate, const struct clk_div_table *table,
u8 width, unsigned long flags);
--
git-series 0.8.11
next prev parent reply other threads:[~2017-05-03 12:00 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 11:59 [PATCH v2 0/20] drm: sun4i: Add support for the HDMI controller Maxime Ripard
2017-05-03 11:59 ` Maxime Ripard [this message]
2017-05-03 12:53 ` [PATCH v2 1/20] clk: divider: Make divider_round_rate take the parent clock Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 2/20] clk: sunxi-ng: Pass the parent and a pointer to the clocks round rate Maxime Ripard
2017-05-04 3:19 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 3/20] clk: sunxi-ng: div: Switch to divider_round_rate Maxime Ripard
2017-05-04 3:20 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 4/20] clk: sunxi-ng: mux: Don't just rely on the parent for CLK_SET_RATE_PARENT Maxime Ripard
2017-05-04 3:23 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 5/20] clk: sunxi-ng: mux: split out the pre-divider computation code Maxime Ripard
2017-05-04 3:25 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 6/20] clk: sunxi-ng: mux: Change pre-divider application function prototype Maxime Ripard
2017-05-04 3:27 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 7/20] clk: sunxi-ng: mux: Re-adjust parent rate Maxime Ripard
2017-05-04 3:28 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 8/20] clk: sunxi-ng: sun5i: Export video PLLs Maxime Ripard
2017-05-04 3:28 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 9/20] drm/sun4i: tcon: Add channel debug Maxime Ripard
2017-05-03 11:59 ` [PATCH v2 10/20] drm/sun4i: tcon: Move the muxing out of the mode set function Maxime Ripard
2017-05-04 3:54 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 11/20] drm/sun4i: tcon: Switch mux on only for composite Maxime Ripard
2017-05-04 3:57 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 12/20] drm/sun4i: tcon: Fix tcon channel 1 backporch calculation Maxime Ripard
2017-05-03 11:59 ` [PATCH v2 13/20] drm/sun4i: tcon: Change vertical total size computation inconsistency Maxime Ripard
2017-05-04 3:58 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 14/20] drm/sun4i: tcon: multiply the vtotal when not in interlace Maxime Ripard
2017-05-04 4:07 ` Chen-Yu Tsai
2017-05-05 8:16 ` icenowy
2017-05-03 11:59 ` [PATCH v2 15/20] drm/sun4i: Ignore the generic connectors for components Maxime Ripard
2017-05-04 4:11 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 16/20] dt-bindings: display: sun4i: Add HDMI display bindings Maxime Ripard
2017-05-08 16:20 ` Rob Herring
2017-05-03 11:59 ` [PATCH v2 17/20] dt-bindings: display: sun4i: Add allwinner,tcon-channel property Maxime Ripard
2017-05-08 16:24 ` Rob Herring
2017-05-03 11:59 ` [PATCH v2 18/20] drm/sun4i: Add HDMI support Maxime Ripard
2017-05-04 7:55 ` [linux-sunxi] " Chen-Yu Tsai
2017-05-12 6:50 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 19/20] ARM: sun5i: a10s: Add the HDMI controller node Maxime Ripard
2017-05-04 8:04 ` Chen-Yu Tsai
2017-05-03 11:59 ` [PATCH v2 20/20] ARM: sun5i: a10s-olinuxino: Enable HDMI Maxime Ripard
2017-05-04 8:05 ` [linux-sunxi] " Chen-Yu Tsai
2017-05-10 19:23 ` Maxime Ripard
2017-05-11 6:25 ` icenowy
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=9c2f3ed66ae32e55721bfced41dfd70e49cb746c.1493812478.git-series.maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®