diff options
| author | Rob Herring <robh@kernel.org> | 2023-08-21 16:37:06 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2023-08-21 17:09:57 -0500 |
| commit | dfb9758a4af19b5d04fe943c56651675038f29aa (patch) | |
| tree | 9fb6a69e9e0f44726025598d715ddb702e45c39f /drivers/of/platform.c | |
| parent | 7ceb60ece8567e58b7e04965b3a434a0ed606053 (diff) | |
| parent | 7882541ca06d51a6c12d687827176c16d5e05f65 (diff) | |
Merge branch 'dt/linus' into dt/next
Pick up changeset fixes for further rework.
Diffstat (limited to 'drivers/of/platform.c')
| -rw-r--r-- | drivers/of/platform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 8d03d9e65ef9..d328bbb679c7 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -175,7 +175,7 @@ struct platform_device *of_device_alloc(struct device_node *np, } /* setup generic device info */ - device_set_node(&dev->dev, of_fwnode_handle(np)); + device_set_node(&dev->dev, of_fwnode_handle(of_node_get(np))); dev->dev.parent = parent ? : &platform_bus; if (bus_id) @@ -273,7 +273,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, dev->dev.dma_mask = &dev->dev.coherent_dma_mask; /* setup generic device info */ - device_set_node(&dev->dev, of_fwnode_handle(node)); + device_set_node(&dev->dev, of_fwnode_handle(of_node_get(node))); dev->dev.parent = parent ? : &platform_bus; dev->dev.platform_data = platform_data; if (bus_id) @@ -586,7 +586,7 @@ static int __init of_platform_default_populate_init(void) if (!of_get_property(node, "linux,opened", NULL) || !of_get_property(node, "linux,boot-display", NULL)) continue; - dev = of_platform_device_create(node, "of-display.0", NULL); + dev = of_platform_device_create(node, "of-display", NULL); of_node_put(node); if (WARN_ON(!dev)) return -ENOMEM; |