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>
Subject: [PATCH 06/17] of: Set of_chosen and of_model earlier
Date: Thu,  6 May 2021 11:28:50 +0200	[thread overview]
Message-ID: <20210506092901.25461-7-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210506092901.25461-1-s.hauer@pengutronix.de>

of_chosen and of_model can be set once we have the device tree root node,
no need to wait until we probe the tree.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/of/base.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 7b3cfa8393..1518854d2e 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1682,6 +1682,9 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)
 }
 EXPORT_SYMBOL_GPL(of_modalias_node);
 
+static struct device_node *of_chosen;
+static const char *of_model;
+
 struct device_node *of_get_root_node(void)
 {
 	return root_node;
@@ -1694,6 +1697,12 @@ int of_set_root_node(struct device_node *node)
 
 	root_node = node;
 
+	of_chosen = of_find_node_by_path("/chosen");
+	of_property_read_string(root_node, "model", &of_model);
+
+	if (of_model)
+		barebox_set_model(of_model);
+
 	of_alias_scan();
 
 	return 0;
@@ -2263,9 +2272,6 @@ int of_add_memory(struct device_node *node, bool dump)
 	return 0;
 }
 
-static struct device_node *of_chosen;
-static const char *of_model;
-
 const char *of_get_model(void)
 {
 	return of_model;
@@ -2325,12 +2331,6 @@ int of_probe(void)
 	if(!root_node)
 		return -ENODEV;
 
-	of_chosen = of_find_node_by_path("/chosen");
-	of_property_read_string(root_node, "model", &of_model);
-
-	if (of_model)
-		barebox_set_model(of_model);
-
 	firmware = of_find_node_by_path("/firmware");
 	if (firmware)
 		of_platform_populate(firmware, NULL, NULL);
-- 
2.29.2


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


  parent reply	other threads:[~2021-05-06  9:30 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-06  9:28 [PATCH v5 00/17] barebox deep probe support Sascha Hauer
2021-05-06  9:28 ` [PATCH 01/17] imx53: remove unused imx53_add_nand Sascha Hauer
2021-05-06  9:28 ` [PATCH 02/17] of: platform: remove check of already added devices Sascha Hauer
2021-05-06  9:28 ` [PATCH 03/17] of: platform: Keep track of populated platform devices Sascha Hauer
2021-05-06  9:28 ` [PATCH 04/17] of: base: move memory init from DT to initcall Sascha Hauer
2021-05-06  9:28 ` [PATCH 05/17] of: base: move clock init from of_probe() to barebox_register_of() Sascha Hauer
2021-05-06  9:28 ` Sascha Hauer [this message]
2021-05-06  9:28 ` [PATCH 07/17] of: implement of_get_stdoutpath() Sascha Hauer
2021-05-06  9:28 ` [PATCH 08/17] initcall: add of_populate_initcall Sascha Hauer
2021-05-06  9:28 ` [PATCH 09/17] common: add initial barebox deep-probe support Sascha Hauer
2021-05-06  9:28 ` [PATCH 10/17] pinctrl: Find controller node first Sascha Hauer
2021-05-06  9:28 ` [PATCH 11/17] common: Explicitly probe consoles earlier with deep probe Sascha Hauer
2021-05-06  9:28 ` [PATCH 12/17] pinctrl: Add deep probe support Sascha Hauer
2021-05-06  9:28 ` [PATCH 13/17] ARM: i.MX: esdctl: add deep-probe support Sascha Hauer
2021-05-06  9:28 ` [PATCH 14/17] ARM: stm32mp: ddrctrl: " Sascha Hauer
2021-05-06  9:28 ` [PATCH 15/17] ARM: boards: mx6-sabrelite: " Sascha Hauer
2021-05-06  9:29 ` [PATCH 16/17] ARM: i.MX Phytec physom: convert to board driver Sascha Hauer
2021-05-06  9:29 ` [PATCH 17/17] ARM: i.MX Phytec physom: Add deep-probe support Sascha Hauer
  -- strict thread matches above, loose matches on Subject: below --
2021-04-16  9:49 [PATCH v4 00/17] barebox deep probe support Sascha Hauer
2021-04-16  9:49 ` [PATCH 06/17] of: Set of_chosen and of_model earlier 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=20210506092901.25461-7-s.hauer@pengutronix.de \
    --to=s.hauer@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