From: Antony Pavlov <antonynpavlov@gmail.com>
To: barebox@lists.infradead.org
Subject: [PATCH 1/2] clk: move of_clk_get_parent_name() to common clk code
Date: Fri, 25 Apr 2014 11:57:46 +0400 [thread overview]
Message-ID: <1398412667-18820-2-git-send-email-antonynpavlov@gmail.com> (raw)
In-Reply-To: <1398412667-18820-1-git-send-email-antonynpavlov@gmail.com>
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
drivers/clk/clk.c | 20 ++++++++++++++++++++
drivers/clk/socfpga.c | 19 -------------------
include/linux/clk.h | 1 +
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 23b1a7a..584e2f3 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -390,6 +390,26 @@ struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec)
return clk;
}
+char *of_clk_get_parent_name(struct device_node *np, unsigned int index)
+{
+ struct of_phandle_args clkspec;
+ const char *clk_name;
+ int rc;
+
+ rc = of_parse_phandle_with_args(np, "clocks", "#clock-cells", index,
+ &clkspec);
+ if (rc)
+ return NULL;
+
+ if (of_property_read_string_index(clkspec.np, "clock-output-names",
+ clkspec.args_count ? clkspec.args[0] : 0,
+ &clk_name) < 0)
+ clk_name = clkspec.np->name;
+
+ return xstrdup(clk_name);
+}
+EXPORT_SYMBOL_GPL(of_clk_get_parent_name);
+
/**
* of_clk_init() - Scan and init clock providers from the DT
* @root: parent of the first level to probe or NULL for the root of the tree
diff --git a/drivers/clk/socfpga.c b/drivers/clk/socfpga.c
index 33a55cb..f4257fd 100644
--- a/drivers/clk/socfpga.c
+++ b/drivers/clk/socfpga.c
@@ -49,25 +49,6 @@
static void __iomem *clk_mgr_base_addr;
-char *of_clk_get_parent_name(struct device_node *np, unsigned int index)
-{
- struct of_phandle_args clkspec;
- const char *clk_name;
- int rc;
-
- rc = of_parse_phandle_with_args(np, "clocks", "#clock-cells", index,
- &clkspec);
- if (rc)
- return NULL;
-
- if (of_property_read_string_index(clkspec.np, "clock-output-names",
- clkspec.args_count ? clkspec.args[0] : 0,
- &clk_name) < 0)
- clk_name = clkspec.np->name;
-
- return xstrdup(clk_name);
-}
-
static struct clk *socfpga_fixed_clk(struct device_node *node)
{
uint32_t f = 0;
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 07b27cf..dd9fab7 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -316,6 +316,7 @@ struct clk *of_clk_src_simple_get(struct of_phandle_args *clkspec, void *data);
struct clk *of_clk_get(struct device_node *np, int index);
struct clk *of_clk_get_by_name(struct device_node *np, const char *name);
struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec);
+char *of_clk_get_parent_name(struct device_node *np, unsigned int index);
int of_clk_init(struct device_node *root, const struct of_device_id *matches);
#else
static inline struct clk *of_clk_get(struct device_node *np, int index)
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-04-25 7:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 7:57 [PATCH 0/2] clk: fixed-factor: add DT init function Antony Pavlov
2014-04-25 7:57 ` Antony Pavlov [this message]
2014-04-25 7:57 ` [PATCH 2/2] " Antony Pavlov
2014-04-26 6:10 ` [PATCH 0/2] " 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=1398412667-18820-2-git-send-email-antonynpavlov@gmail.com \
--to=antonynpavlov@gmail.com \
--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