Commit f94277af authored by Robin Murphy's avatar Robin Murphy Committed by Rob Herring

of/platform: Initialise dev->fwnode appropriately

Whilst we're some of the way towards a universal firmware property
interface, drivers which deal with both OF and ACPI probing end up
having to do things like this:

    dev->of_node ? &dev->of_node->fwnode : dev->fwnode

This seems unnecessary, when the OF code could instead simply fill in
the device's fwnode when binding the of_node, and let the drivers use
dev->fwnode either way. Let's give it a go and see what falls out.
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent a67e9472
...@@ -142,6 +142,7 @@ struct platform_device *of_device_alloc(struct device_node *np, ...@@ -142,6 +142,7 @@ struct platform_device *of_device_alloc(struct device_node *np,
} }
dev->dev.of_node = of_node_get(np); dev->dev.of_node = of_node_get(np);
dev->dev.fwnode = &np->fwnode;
dev->dev.parent = parent ? : &platform_bus; dev->dev.parent = parent ? : &platform_bus;
if (bus_id) if (bus_id)
...@@ -241,6 +242,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, ...@@ -241,6 +242,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
/* setup generic device info */ /* setup generic device info */
dev->dev.of_node = of_node_get(node); dev->dev.of_node = of_node_get(node);
dev->dev.fwnode = &node->fwnode;
dev->dev.parent = parent ? : &platform_bus; dev->dev.parent = parent ? : &platform_bus;
dev->dev.platform_data = platform_data; dev->dev.platform_data = platform_data;
if (bus_id) if (bus_id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment