From: Quentin Schulz <foss+uboot@0leil.net>
Cc: sjg@chromium.org, philipp.tomsich@vrull.eu,
kever.yang@rock-chips.com, alpernebiyasak@gmail.com,
email2tema@gmail.com, jagan@amarulasolutions.com,
u-boot@lists.denx.de,
Quentin Schulz <quentin.schulz@theobroma-systems.com>,
Quentin Schulz <foss+uboot@0leil.net>
Subject: [PATCH v3 1/2] rockchip: rk3399: fix incorrect ifdef check on SPL_DM_REGULATOR
Date: Fri, 22 Jul 2022 11:30:13 +0200 [thread overview]
Message-ID: <20220722093014.3850165-1-foss+uboot@0leil.net> (raw)
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
The check to perform is on CONFIG_SPL_DM_REGULATOR and not
SPL_DM_REGULATOR. Also switch to in-code check instead of ifdefs.
Fixes: 07586ee4322a ("rockchip: rk3399: Support common spl_board_init")
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
v2:
- use IS_ENABLED checks,
arch/arm/mach-rockchip/rk3399/rk3399.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 01a05599cd..8205511c25 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -275,13 +275,14 @@ void spl_board_init(void)
rk3399_force_power_on_reset();
#endif
-#if defined(SPL_DM_REGULATOR)
- /*
- * Turning the eMMC and SPI back on (if disabled via the Qseven
- * BIOS_ENABLE) signal is done through a always-on regulator).
- */
- if (regulators_enable_boot_on(false))
- debug("%s: Cannot enable boot on regulator\n", __func__);
-#endif
+ if (IS_ENABLED(CONFIG_SPL_DM_REGULATOR)) {
+ /*
+ * Turning the eMMC and SPI back on (if disabled via the Qseven
+ * BIOS_ENABLE) signal is done through a always-on regulator).
+ */
+ if (regulators_enable_boot_on(false))
+ debug("%s: Cannot enable boot on regulator\n",
+ __func__);
+ }
}
#endif
--
2.37.1
next reply other threads:[~2022-07-22 9:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-22 9:30 Quentin Schulz [this message]
2022-07-22 9:30 ` [PATCH v3 2/2] rockchip: rk3399: fix incorrect ifdef check on SPL_GPIO Quentin Schulz
2022-09-01 12:19 ` Kever Yang
2022-08-12 10:36 ` [PATCH v3 1/2] rockchip: rk3399: fix incorrect ifdef check on SPL_DM_REGULATOR Quentin Schulz
2022-08-18 14:34 ` Jagan Teki
2022-08-21 11:04 ` Peter Robinson
2022-09-01 12:18 ` Kever Yang
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=20220722093014.3850165-1-foss+uboot@0leil.net \
--to=foss+uboot@0leil.net \
--cc=alpernebiyasak@gmail.com \
--cc=email2tema@gmail.com \
--cc=jagan@amarulasolutions.com \
--cc=kever.yang@rock-chips.com \
--cc=philipp.tomsich@vrull.eu \
--cc=quentin.schulz@theobroma-systems.com \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/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;
as well as URLs for NNTP newsgroup(s).