diff options
author | Pawel Moll <pawel.moll@arm.com> | 2013-06-10 11:05:06 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-06-20 03:02:18 -0400 |
commit | e95a49b4297c913312db0854d51e412940f453fc (patch) | |
tree | 37e63eff62f268b595fedf181a0e10c102655cb6 | |
parent | 1c472d8e8284917a7687694effcc7ebb6911b63d (diff) |
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.c | 4 |
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) | |||
107 | osc->func = vexpress_config_func_get_by_node(node); | 107 | osc->func = vexpress_config_func_get_by_node(node); |
108 | if (!osc->func) { | 108 | if (!osc->func) { |
109 | pr_err("Failed to obtain config func for node '%s'!\n", | 109 | pr_err("Failed to obtain config func for node '%s'!\n", |
110 | node->name); | 110 | node->full_name); |
111 | goto error; | 111 | goto error; |
112 | } | 112 | } |
113 | 113 | ||
@@ -119,7 +119,7 @@ void __init vexpress_osc_of_setup(struct device_node *node) | |||
119 | 119 | ||
120 | of_property_read_string(node, "clock-output-names", &init.name); | 120 | of_property_read_string(node, "clock-output-names", &init.name); |
121 | if (!init.name) | 121 | if (!init.name) |
122 | init.name = node->name; | 122 | init.name = node->full_name; |
123 | 123 | ||
124 | init.ops = &vexpress_osc_ops; | 124 | init.ops = &vexpress_osc_ops; |
125 | init.flags = CLK_IS_ROOT; | 125 | init.flags = CLK_IS_ROOT; |