summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Moll <pawel.moll@arm.com>2013-06-10 16:05:06 +0100
committerMike Turquette <mturquette@linaro.org>2013-06-20 00:02:18 -0700
commite95a49b4297c913312db0854d51e412940f453fc (patch)
tree37e63eff62f268b595fedf181a0e10c102655cb6
parent1c472d8e8284917a7687694effcc7ebb6911b63d (diff)
downloadlinux-stable-e95a49b4297c913312db0854d51e412940f453fc.tar.gz
linux-stable-e95a49b4297c913312db0854d51e412940f453fc.tar.bz2
linux-stable-e95a49b4297c913312db0854d51e412940f453fc.zip
clk: vexpress: Use full node name to identify individual clocks
Previously all the clocks were reported as "osc". Now it will be something like "/dcc/osc@0". Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r--drivers/clk/versatile/clk-vexpress-osc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c
index 256c8be74df8..2dc8b41a339d 100644
--- a/drivers/clk/versatile/clk-vexpress-osc.c
+++ b/drivers/clk/versatile/clk-vexpress-osc.c
@@ -107,7 +107,7 @@ void __init vexpress_osc_of_setup(struct device_node *node)
osc->func = vexpress_config_func_get_by_node(node);
if (!osc->func) {
pr_err("Failed to obtain config func for node '%s'!\n",
- node->name);
+ node->full_name);
goto error;
}
@@ -119,7 +119,7 @@ void __init vexpress_osc_of_setup(struct device_node *node)
of_property_read_string(node, "clock-output-names", &init.name);
if (!init.name)
- init.name = node->name;
+ init.name = node->full_name;
init.ops = &vexpress_osc_ops;
init.flags = CLK_IS_ROOT;