From: Marco Felsch <m.felsch@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v3 03/10] of: platform: Keep track of populated platform devices
Date: Wed, 21 Oct 2020 13:58:06 +0200 [thread overview]
Message-ID: <20201021115813.31645-4-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20201021115813.31645-1-m.felsch@pengutronix.de>
Linux does not allow to populate the same of device more than once.
Linux uses the OF_POPULATED flag for that purpose. Align the logic with
the current linux state with the exception that we are returning the
already created device. This is needed for the later added deep-probe
mechanism.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
Changelog:
v3:
- new patch
---
drivers/of/platform.c | 20 +++++++++++++++++++-
include/of.h | 1 +
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 51781798c6..01de6f98af 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -106,6 +106,13 @@ struct device_d *of_platform_device_create(struct device_node *np,
if (!of_device_is_available(np))
return NULL;
+ /*
+ * Linux uses the OF_POPULATED flag to skip already populated/created
+ * devices.
+ */
+ if (np->dev)
+ return np->dev;
+
/* count the io resources */
if (of_can_translate_address(np))
while (of_address_to_resource(np, num_reg, &temp_res) == 0)
@@ -141,8 +148,10 @@ struct device_d *of_platform_device_create(struct device_node *np,
(num_reg) ? &dev->resource[0].start : &resinval);
ret = platform_device_register(dev);
- if (!ret)
+ if (!ret) {
+ np->dev = dev;
return dev;
+ }
free(dev);
if (num_reg)
@@ -223,6 +232,13 @@ static struct device_d *of_amba_device_create(struct device_node *np)
if (!of_device_is_available(np))
return NULL;
+ /*
+ * Linux uses the OF_POPULATED flag to skip already populated/created
+ * devices.
+ */
+ if (np->dev)
+ return np->dev;
+
dev = xzalloc(sizeof(*dev));
/* setup generic device info */
@@ -246,6 +262,8 @@ static struct device_d *of_amba_device_create(struct device_node *np)
if (ret)
goto amba_err_free;
+ np->dev = &dev->dev;
+
return &dev->dev;
amba_err_free:
diff --git a/include/of.h b/include/of.h
index 08a02e1105..d1dbb702d8 100644
--- a/include/of.h
+++ b/include/of.h
@@ -35,6 +35,7 @@ struct device_node {
struct list_head parent_list;
struct list_head list;
phandle phandle;
+ struct device_d *dev;
};
struct of_device_id {
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-10-21 11:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 11:58 [PATCH v3 00/10] Barebox Deep-Probe Marco Felsch
2020-10-21 11:58 ` [PATCH v3 01/10] imx53: remove unused imx53_add_nand Marco Felsch
2020-10-21 11:58 ` [PATCH v3 02/10] of: platform: remove check of already added devices Marco Felsch
2020-10-21 11:58 ` Marco Felsch [this message]
2020-10-21 11:58 ` [PATCH v3 04/10] of: base: move memory init from DT to initcall Marco Felsch
2020-10-21 11:58 ` [PATCH v3 05/10] of: base: move clock init from of_probe() to barebox_register_of() Marco Felsch
2020-10-21 11:58 ` [PATCH v3 06/10] initcall: add of_populate_initcall Marco Felsch
2020-10-21 11:58 ` [PATCH v3 07/10] common: add initial barebox deep-probe support Marco Felsch
2020-10-22 7:23 ` Sascha Hauer
2020-10-22 7:43 ` Sascha Hauer
2020-10-21 11:58 ` [PATCH v3 08/10] ARM: i.MX: esdctl: add " Marco Felsch
2020-10-21 11:58 ` [PATCH v3 09/10] ARM: stm32mp: ddrctrl: " Marco Felsch
2020-10-21 11:58 ` [PATCH v3 10/10] ARM: boards: mx6-sabrelite: " Marco Felsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201021115813.31645-4-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox