From: Robin van der Gracht <robin.van.der.gracht@protonic.nl>
To: barebox@lists.infradead.org
Cc: Robin van der Gracht <robin.van.der.gracht@protonic.nl>
Subject: [PATCH 7/9] ARM: boards: protonic-rk356x: Move bbu setup to device late init
Date: Wed, 4 Mar 2026 12:00:11 +0100 [thread overview]
Message-ID: <20260304110013.495725-8-robin.van.der.gracht@protonic.nl> (raw)
In-Reply-To: <20260304110013.495725-1-robin.van.der.gracht@protonic.nl>
Move bbu setup to a separate function and call it from the devices_init
late initcall.
Signed-off-by: Robin van der Gracht <robin.van.der.gracht@protonic.nl>
---
arch/arm/boards/protonic-rk356x/board.c | 26 +++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boards/protonic-rk356x/board.c b/arch/arm/boards/protonic-rk356x/board.c
index 1d707bb715..5fba0be98a 100644
--- a/arch/arm/boards/protonic-rk356x/board.c
+++ b/arch/arm/boards/protonic-rk356x/board.c
@@ -123,10 +123,26 @@ static int prt_rk356x_mecsbc_init(void)
return 0;
}
+static void prt_rk356x_bbu(void)
+{
+ enum bootsource bootsource = bootsource_get();
+ int instance = bootsource_get_instance();
+
+ if (bootsource == BOOTSOURCE_MMC && instance == 1)
+ of_device_enable_path("/chosen/environment-sd");
+ else
+ of_device_enable_path("/chosen/environment-emmc");
+
+ rockchip_bbu_mmc_register("emmc", BBU_HANDLER_FLAG_DEFAULT, "/dev/mmc0");
+ rockchip_bbu_mmc_register("sd", 0, "/dev/mmc1");
+}
+
static int prt_rk356x_devices_init(void)
{
int ret;
+ prt_rk356x_bbu();
+
if (prt_priv.model->init) {
ret = prt_priv.model->init();
if (ret) {
@@ -157,8 +173,6 @@ static int prt_rk356x_of_fixup_hwrev(struct device *dev)
static int prt_rk356x_probe(struct device *dev)
{
int error;
- enum bootsource bootsource = bootsource_get();
- int instance = bootsource_get_instance();
const struct prt_rk356x_model *model;
error = of_device_ensure_probed_by_alias("saradc");
@@ -172,14 +186,6 @@ static int prt_rk356x_probe(struct device *dev)
barebox_set_model(model->name);
barebox_set_hostname(model->shortname);
- if (bootsource == BOOTSOURCE_MMC && instance == 1)
- of_device_enable_path("/chosen/environment-sd");
- else
- of_device_enable_path("/chosen/environment-emmc");
-
- rockchip_bbu_mmc_register("emmc", BBU_HANDLER_FLAG_DEFAULT, "/dev/mmc0");
- rockchip_bbu_mmc_register("sd", 0, "/dev/mmc1");
-
prt_rk356x_process_adc(dev, &model->adc_channels);
prt_rk356x_of_fixup_hwrev(dev);
--
2.43.0
next prev parent reply other threads:[~2026-03-04 11:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-04 11:00 [PATCH 0/9] ARM: boards: protonic-mecsbc: Generalization Robin van der Gracht
2026-03-04 11:00 ` [PATCH 1/9] ARM: boards: Rename protonic-mecsbc to protonic-rk356x Robin van der Gracht
2026-03-04 11:00 ` [PATCH 2/9] ARM: boards: protonic-rk356x: Remove VIN measurement Robin van der Gracht
2026-03-04 11:00 ` [PATCH 3/9] ARM: boards: protonic-rk356x: Use devicetree alias for saradc Robin van der Gracht
2026-03-04 11:00 ` [PATCH 4/9] ARM: boards: protonic-rk356x: Configure ADC and channels in model data Robin van der Gracht
2026-03-04 11:00 ` [PATCH 5/9] ARM: boards: protonic-rk356x: Move mecsbc code to model init function Robin van der Gracht
2026-03-04 11:00 ` [PATCH 6/9] ARM: boards: protonic-rk356x: Use rockchip_bbu_mmc_register Robin van der Gracht
2026-03-04 11:00 ` Robin van der Gracht [this message]
2026-03-04 11:00 ` [PATCH 8/9] ARM: boards: protonic-rk356x: Fix crash with different boards Robin van der Gracht
2026-03-04 11:00 ` [PATCH 9/9] ARM: boards: protonic-rk356x: Read board serial and MAC address from eMMC Robin van der Gracht
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=20260304110013.495725-8-robin.van.der.gracht@protonic.nl \
--to=robin.van.der.gracht@protonic.nl \
--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