lkml.org 
[lkml]   [2018]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 12/12] of/platform: make the OF code aware of early platform drivers
Date
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Check the relevant flag in the device node and skip the allocation
part for devices that were populated early.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/of/platform.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 0e554fe1f325..91760e2d3dc7 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -21,6 +21,7 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h>
+#include <linux/early_platform.h>

const struct of_device_id of_default_bus_match_table[] = {
{ .compatible = "simple-bus", },
@@ -196,9 +197,17 @@ static struct platform_device *of_platform_device_create_pdata(
of_node_test_and_set_flag(np, OF_POPULATED))
return NULL;

- dev = of_device_alloc(np, bus_id, parent);
- if (!dev)
- goto err_clear_flag;
+ if (of_node_check_flag(np, OF_POPULATED_EARLY)) {
+ dev = of_early_to_platform_device(np);
+ if (IS_ERR(dev))
+ goto err_clear_flag;
+
+ of_device_init(dev, np, bus_id, parent);
+ } else {
+ dev = of_device_alloc(np, bus_id, parent);
+ if (!dev)
+ goto err_clear_flag;
+ }

dev->dev.bus = &platform_bus_type;
dev->dev.platform_data = platform_data;
--
2.17.0
\
 
 \ /
  Last update: 2018-05-11 18:23    [W:0.063 / U:0.036 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site