[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180511162028.20616-13-brgl@bgdev.pl>
Date: Fri, 11 May 2018 18:20:28 +0200
From: Bartosz Golaszewski <brgl@...ev.pl>
To: Sekhar Nori <nsekhar@...com>, Kevin Hilman <khilman@...nel.org>,
David Lechner <david@...hnology.com>,
Michael Turquette <mturquette@...libre.com>,
Stephen Boyd <sboyd@...nel.org>, Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Mark Rutland <mark.rutland@....com>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>,
Rich Felker <dalias@...c.org>,
Andy Shevchenko <andy.shevchenko@...il.com>,
Marc Zyngier <marc.zyngier@....com>,
"Rafael J . Wysocki" <rafael.j.wysocki@...el.com>,
Peter Rosin <peda@...ntia.se>, Jiri Slaby <jslaby@...e.com>,
Thomas Gleixner <tglx@...utronix.de>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Magnus Damm <magnus.damm@...il.com>,
Johan Hovold <johan@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Frank Rowand <frowand.list@...il.com>
Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
devicetree@...r.kernel.org, linux-arch@...r.kernel.org,
Bartosz Golaszewski <bgolaszewski@...libre.com>
Subject: [PATCH 12/12] of/platform: make the OF code aware of early platform drivers
From: Bartosz Golaszewski <bgolaszewski@...libre.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@...libre.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
Powered by blists - more mailing lists