mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Cc: Marco Felsch <m.felsch@pengutronix.de>
Subject: [PATCH 04/19] of: base: move memory init from DT to initcall
Date: Fri, 25 Jun 2021 09:25:25 +0200	[thread overview]
Message-ID: <20210625072540.32717-5-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210625072540.32717-1-s.hauer@pengutronix.de>

From: Lucas Stach <dev@lynxeye.de>

Instead of calling it from of_probe, convert it to a initcall at
the appropriate level. This allows to move of_probe to later in
the init sequence while keeping the memory init at the same place,
which is important as many other drivers need the valid memory area
to be set up properly.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.pengutronix.de/20201021115813.31645-5-m.felsch@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/of/base.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 193bae7fa0..d0d955f464 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2300,6 +2300,9 @@ static int of_probe_memory(void)
 	struct device_node *memory = root_node;
 	int ret = 0;
 
+	if (!IS_ENABLED(CONFIG_OFDEVICE))
+		return 0;
+
 	/* Parse all available node with "memory" device_type */
 	while (1) {
 		int err;
@@ -2315,6 +2318,7 @@ static int of_probe_memory(void)
 
 	return ret;
 }
+mem_initcall(of_probe_memory);
 
 static void of_platform_device_create_root(struct device_node *np)
 {
@@ -2334,7 +2338,6 @@ static void of_platform_device_create_root(struct device_node *np)
 int of_probe(void)
 {
 	struct device_node *firmware;
-	int ret;
 
 	if(!root_node)
 		return -ENODEV;
@@ -2345,8 +2348,6 @@ int of_probe(void)
 	if (of_model)
 		barebox_set_model(of_model);
 
-	ret = of_probe_memory();
-
 	firmware = of_find_node_by_path("/firmware");
 	if (firmware)
 		of_platform_populate(firmware, NULL, NULL);
@@ -2356,7 +2357,7 @@ int of_probe(void)
 	of_clk_init(root_node, NULL);
 	of_platform_populate(root_node, of_default_bus_match_table, NULL);
 
-	return ret;
+	return 0;
 }
 
 /**
-- 
2.29.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  parent reply	other threads:[~2021-06-25  7:44 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25  7:25 [PATCH v6 00/19] barebox deep probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 01/19] imx53: remove unused imx53_add_nand Sascha Hauer
2021-06-25  7:25 ` [PATCH 02/19] of: platform: remove check of already added devices Sascha Hauer
2021-06-25  7:25 ` [PATCH 03/19] of: platform: Keep track of populated platform devices Sascha Hauer
2021-06-25  7:25 ` Sascha Hauer [this message]
2021-06-25  7:25 ` [PATCH 05/19] of: base: move clock init from of_probe() to barebox_register_of() Sascha Hauer
2021-06-25  7:25 ` [PATCH 06/19] of: Set of_chosen and of_model earlier Sascha Hauer
2021-06-25  7:25 ` [PATCH 07/19] of: implement of_get_stdoutpath() Sascha Hauer
2021-06-25  7:25 ` [PATCH 08/19] initcall: add of_populate_initcall Sascha Hauer
2021-06-25  7:25 ` [PATCH 09/19] common: add initial barebox deep-probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 10/19] pinctrl: Find controller node first Sascha Hauer
2021-06-25  7:25 ` [PATCH 11/19] common: Explicitly probe consoles earlier with deep probe Sascha Hauer
2021-06-25  7:25 ` [PATCH 12/19] pinctrl: Add deep probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 13/19] phy: " Sascha Hauer
2021-06-25  7:25 ` [PATCH 14/19] ARM: i.MX: esdctl: add deep-probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 15/19] ARM: stm32mp: ddrctrl: " Sascha Hauer
2021-06-25  7:25 ` [PATCH 16/19] ARM: boards: mx6-sabrelite: " Sascha Hauer
2021-06-25  7:25 ` [PATCH 17/19] ARM: i.MX Phytec physom: convert to board driver Sascha Hauer
2021-06-25  7:25 ` [PATCH 18/19] ARM: i.MX Phytec physom: Add deep-probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 19/19] of: Add dummy driver Sascha Hauer

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=20210625072540.32717-5-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=m.felsch@pengutronix.de \
    --subject='Re: [PATCH 04/19] of: base: move memory init from DT to initcall' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox