diff options
| -rw-r--r-- | drivers/clk/clk.c | 8 | ||||
| -rw-r--r-- | drivers/of/platform.c | 5 | ||||
| -rw-r--r-- | include/of.h | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index fff1e21144..189c9c62df 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -845,9 +845,15 @@ int of_clk_init(struct device_node *root, const struct of_device_id *matches) struct device_node *np = clk_provider->np; if (force || parent_ready(np)) { + struct device_d *dev; of_pinctrl_select_state_default(np); - clk_provider->clk_init_cb(np); + + dev = of_device_create_on_demand(np); + + if (clk_provider->clk_init_cb(np) == 0 && dev) + of_platform_device_dummy_drv(dev); + of_clk_set_defaults(np, true); list_del(&clk_provider->node); diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 92b6caef5a..ce7a2a0df5 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -373,11 +373,14 @@ int of_platform_populate(struct device_node *root, } EXPORT_SYMBOL_GPL(of_platform_populate); -static struct device_d *of_device_create_on_demand(struct device_node *np) +struct device_d *of_device_create_on_demand(struct device_node *np) { struct device_node *parent; struct device_d *parent_dev, *dev; + if (!deep_probe_is_supported()) + return NULL; + parent = of_get_parent(np); if (!parent) return NULL; diff --git a/include/of.h b/include/of.h index f9c2b283de..1b7392cdb3 100644 --- a/include/of.h +++ b/include/of.h @@ -279,6 +279,7 @@ extern struct device_d *of_device_enable_and_register_by_name(const char *name); extern struct device_d *of_device_enable_and_register_by_alias( const char *alias); +extern struct device_d *of_device_create_on_demand(struct device_node *np); extern int of_device_ensure_probed(struct device_node *np); extern int of_device_ensure_probed_by_alias(const char *alias); extern int of_devices_ensure_probed_by_property(const char *property_name); @@ -372,6 +373,11 @@ static inline void of_platform_device_dummy_drv(struct device_d *dev) { } +static inline struct device_d *of_device_create_on_demand(struct device_node *np) +{ + return NULL; +} + static inline int of_device_ensure_probed(struct device_node *np) { return 0; |