Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[mirror_ubuntu-artful-kernel.git] / drivers / of / platform.c

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index d85e4318b099275e0cae9e46e7af138b71c09be8..e4bf07d20f9bbf416f756ca381d3340ce662272f 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -143,6 +143,7 @@ struct platform_device *of_device_alloc(struct device_node *np,
        }
 
        dev->dev.of_node = of_node_get(np);
+       dev->dev.fwnode = &np->fwnode;
        dev->dev.parent = parent ? : &platform_bus;
 
        if (bus_id)
@@ -242,6 +243,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
 
        /* setup generic device info */
        dev->dev.of_node = of_node_get(node);
+       dev->dev.fwnode = &node->fwnode;
        dev->dev.parent = parent ? : &platform_bus;
        dev->dev.platform_data = platform_data;
        if (bus_id)