diff options
author | Sudeep Holla <sudeep.holla@arm.com> | 2015-05-14 10:28:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-26 22:55:56 -0400 |
commit | 194ec9368c0dbc421acdb2620d4dfb3cc3d022ff (patch) | |
tree | 8abbb63558a732fcf5be6ab7843e960752707d29 /drivers/of | |
parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) |
drivers: of/base: move of_init to driver_init
Commit 5590f3196b29 ("drivers/core/of: Add symlink to device-tree from
devices with an OF node") adds the symlink `of_node` for each device
pointing to it's device tree node while creating/initialising it.
However the devicetree sysfs is created and setup in of_init which is
executed at core_initcall level. For all the devices created before
of_init, the following error is thrown:
"Error -2(-ENOENT) creating of_node link"
Like many other components in driver model, initialize the sysfs support
for OF/devicetree from driver_init so that it's ready before any devices
are created.
Fixes: 5590f3196b29 ("drivers/core/of: Add symlink to device-tree from
devices with an OF node")
Suggested-by: Rob Herring <robh+dt@kernel.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Tested-by: Robert Schwebel <r.schwebel@pengutronix.de>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/base.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 99764db0875a..f0650265febf 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c | |||
@@ -189,7 +189,7 @@ int __of_attach_node_sysfs(struct device_node *np) | |||
189 | return 0; | 189 | return 0; |
190 | } | 190 | } |
191 | 191 | ||
192 | static int __init of_init(void) | 192 | void __init of_core_init(void) |
193 | { | 193 | { |
194 | struct device_node *np; | 194 | struct device_node *np; |
195 | 195 | ||
@@ -198,7 +198,8 @@ static int __init of_init(void) | |||
198 | of_kset = kset_create_and_add("devicetree", NULL, firmware_kobj); | 198 | of_kset = kset_create_and_add("devicetree", NULL, firmware_kobj); |
199 | if (!of_kset) { | 199 | if (!of_kset) { |
200 | mutex_unlock(&of_mutex); | 200 | mutex_unlock(&of_mutex); |
201 | return -ENOMEM; | 201 | pr_err("devicetree: failed to register existing nodes\n"); |
202 | return; | ||
202 | } | 203 | } |
203 | for_each_of_allnodes(np) | 204 | for_each_of_allnodes(np) |
204 | __of_attach_node_sysfs(np); | 205 | __of_attach_node_sysfs(np); |
@@ -207,10 +208,7 @@ static int __init of_init(void) | |||
207 | /* Symlink in /proc as required by userspace ABI */ | 208 | /* Symlink in /proc as required by userspace ABI */ |
208 | if (of_root) | 209 | if (of_root) |
209 | proc_symlink("device-tree", NULL, "/sys/firmware/devicetree/base"); | 210 | proc_symlink("device-tree", NULL, "/sys/firmware/devicetree/base"); |
210 | |||
211 | return 0; | ||
212 | } | 211 | } |
213 | core_initcall(of_init); | ||
214 | 212 | ||
215 | static struct property *__of_find_property(const struct device_node *np, | 213 | static struct property *__of_find_property(const struct device_node *np, |
216 | const char *name, int *lenp) | 214 | const char *name, int *lenp) |