From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 2/9] clk: implement CLK_OPS_PARENT_ENABLE
Date: Mon, 6 Feb 2017 07:50:50 +0100 [thread overview]
Message-ID: <20170206065057.19483-3-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20170206065057.19483-1-s.hauer@pengutronix.de>
Some clocks may only be modified when their parent clocks are enabled.
The kernel has the CLK_OPS_PARENT_ENABLE flag for this purpose.
Implement it for barebox aswell.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/clk/clk.c | 31 +++++++++++++++++++++++++++----
include/linux/clk.h | 2 ++
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 6f3053727..93e000c6e 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -141,6 +141,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
{
struct clk *parent;
unsigned long parent_rate = 0;
+ int ret;
if (!clk)
return 0;
@@ -148,14 +149,26 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
if (IS_ERR(clk))
return PTR_ERR(clk);
+ if (!clk->ops->set_rate)
+ return -ENOSYS;
+
parent = clk_get_parent(clk);
- if (parent)
+ if (parent) {
parent_rate = clk_get_rate(parent);
- if (clk->ops->set_rate)
- return clk->ops->set_rate(clk, rate, parent_rate);
+ if (clk->flags & CLK_OPS_PARENT_ENABLE) {
+ ret = clk_enable(parent);
+ if (ret)
+ return ret;
+ }
+ }
+
+ ret = clk->ops->set_rate(clk, rate, parent_rate);
+
+ if (parent && clk->flags & CLK_OPS_PARENT_ENABLE)
+ clk_disable(parent);
- return -ENOSYS;
+ return ret;
}
struct clk *clk_lookup(const char *name)
@@ -203,8 +216,18 @@ int clk_set_parent(struct clk *clk, struct clk *newparent)
if (clk->enable_count)
clk_enable(newparent);
+ if (clk->flags & CLK_OPS_PARENT_ENABLE) {
+ clk_enable(curparent);
+ clk_enable(newparent);
+ }
+
ret = clk->ops->set_parent(clk, i);
+ if (clk->flags & CLK_OPS_PARENT_ENABLE) {
+ clk_disable(curparent);
+ clk_disable(newparent);
+ }
+
if (clk->enable_count)
clk_disable(curparent);
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 8cb9731f1..697ab4ff4 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -198,6 +198,8 @@ static inline int clk_set_rate(struct clk *clk, unsigned long rate)
#ifdef CONFIG_COMMON_CLK
#define CLK_SET_RATE_PARENT (1 << 0) /* propagate rate change up one level */
+/* parents need enable during gate/ungate, set rate and re-parent */
+#define CLK_OPS_PARENT_ENABLE (1 << 12)
#define CLK_GATE_INVERTED (1 << 0)
#define CLK_GATE_HIWORD_MASK (1 << 1)
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-02-06 6:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-06 6:50 i.MX7 Ethernet clock fixes Sascha Hauer
2017-02-06 6:50 ` [PATCH 1/9] clk: Keep enable count consistent over reparent Sascha Hauer
2017-02-06 6:50 ` Sascha Hauer [this message]
2017-02-06 6:50 ` [PATCH 3/9] clk: i.MX: clk-gate2: Allow to pass flags Sascha Hauer
2017-02-06 6:50 ` [PATCH 4/9] clk: i.MX: Pass CLK_OPS_PARENT_ENABLE where necessary Sascha Hauer
2017-02-06 6:50 ` [PATCH 5/9] clk: i.MX7: do clock reparenting when all clocks are initialized Sascha Hauer
2017-02-06 6:50 ` [PATCH 6/9] clk: Add support for shared gates Sascha Hauer
2017-02-06 6:50 ` [PATCH 7/9] clk: i.MX7: Fix ethernet clocks Sascha Hauer
2017-02-06 6:50 ` [PATCH 8/9] clk: i.MX7: do not register PLL bypass clocks as separate clocks Sascha Hauer
2017-02-06 6:50 ` [PATCH 9/9] clk: i.MX7: setup ethernet clocks Sascha Hauer
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=20170206065057.19483-3-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.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