summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAntony Pavlov <antonynpavlov@gmail.com>2014-04-25 11:57:46 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2014-04-29 08:11:24 +0200
commita210138078d4598af97711cf9e36376f750c75d9 (patch)
tree5489883b52ea0970a0af017e9593ebc62c50ce8c /drivers
parent3fafc8e5c702828b783f6b66bccfd5c40db98fd9 (diff)
downloadbarebox-a210138078d4598af97711cf9e36376f750c75d9.tar.gz
barebox-a210138078d4598af97711cf9e36376f750c75d9.tar.xz
clk: move of_clk_get_parent_name() to common clk code
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/clk.c20
-rw-r--r--drivers/clk/socfpga.c19
2 files changed, 20 insertions, 19 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 23b1a7a7ea..584e2f3242 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 33a55cbeeb..f4257fdb5c 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;