To prevent of_platform_populate() from trying to populate duplicate
devices if a device has been already populated.
Signed-off-by: Hiroshi Doyu <hdoyu@xxxxxxxxxx>
---
Need to take care of early_platform_devices, or alternative solution.
---
drivers/of/base.c | 23 +++++++++++++++++++++++
drivers/of/platform.c | 8 ++++++++
include/linux/of.h | 16 ++++++++++++++++
3 files changed, 47 insertions(+)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 5c54279..99062dd 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -230,6 +230,29 @@ const void *of_get_property(const struct device_node *np, const char *name,
}
EXPORT_SYMBOL(of_get_property);
+struct device *of_get_device(const struct device_node *node)
+{
+ struct device *dev;
+ unsigned long flags;
+
+ raw_spin_lock_irqsave(&devtree_lock, flags);
+ dev = node->dev;
+ raw_spin_unlock_irqrestore(&devtree_lock, flags);
+
+ return dev;
+}
+EXPORT_SYMBOL(of_get_device);
+
+void of_set_device(struct device_node *node, struct device *dev)
+{
+ unsigned long flags;
+
+ raw_spin_lock_irqsave(&devtree_lock, flags);
+ node->dev = dev;
+ raw_spin_unlock_irqrestore(&devtree_lock, flags);
+}
+EXPORT_SYMBOL(of_set_device);
+
/** Checks if the given "compat" string matches one of the strings in
* the device's "compatible" property
*/
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index e0a6514..a8f6b09 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -203,10 +203,17 @@ struct platform_device *of_platform_device_create_pdata(
struct device *parent)
{
struct platform_device *dev;
+ struct device *tmp;
if (!of_device_is_available(np))
return NULL;
+ tmp = of_get_device(np);
+ if (tmp) {
+ dev_info(tmp, "Already populated\n");
+ return to_platform_device(tmp);
+ }
+
dev = of_device_alloc(np, bus_id, parent);
if (!dev)
return NULL;
@@ -228,6 +235,7 @@ struct platform_device *of_platform_device_create_pdata(
return NULL;
}
+ of_set_device(np, &dev->dev);
return dev;
}
diff --git a/include/linux/of.h b/include/linux/of.h
index 1fd08ca..b548522 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -60,6 +60,9 @@ struct device_node {
struct kref kref;
unsigned long _flags;
void *data;
+
+ struct device *dev; /* Set only after populated */
+
#if defined(CONFIG_SPARC)
const char *path_component_name;
unsigned int unique_id;
@@ -268,6 +271,8 @@ extern const void *of_get_property(const struct device_node *node,
int *lenp);
#define for_each_property_of_node(dn, pp) \
for (pp = dn->properties; pp != NULL; pp = pp->next)
+extern struct device *of_get_device(const struct device_node *node);
+extern void of_set_device(struct device_node *node, struct device *dev);
extern int of_n_addr_cells(struct device_node *np);
extern int of_n_size_cells(struct device_node *np);
@@ -459,6 +464,17 @@ static inline const void *of_get_property(const struct device_node *node,
return NULL;
}
+static inline struct device *of_get_device(const struct device_node *node)
+{
+ return NULL;
+}
+
+static inline void of_set_device(const struct device_node *node,
+ struct device *dev);
+{
+ return -ENOSYS;
+}
+
static inline int of_property_read_u64(const struct device_node *np,
const char *propname, u64 *out_value)
{
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
