[PATCH v2 2/2] rockchip: rk3399: fix incorrect ifdef check on SPL_GPIO

Quentin Schulz
2022-07-15T15:10:29Z

From: Quentin Schulz <quentin.schulz@theobroma-systems.com>

The check to perform is on CONFIG_SPL_GPIO and not SPL_GPIO.
Because this was never compiled in, it missed an include of cru.h that
was not detected before. Let's include it too.

Also switch to IS_ENABLED ifdef and in-code check.

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 | 45 ++++++++++++++------------
1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 920da22307..db8a6cb83a 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -221,7 +221,9 @@ void spl_perform_fixups(struct spl_image_info *spl_image)
"u-boot,spl-boot-device", boot_ofpath);
}

-#if defined(SPL_GPIO)
+#if IS_ENABLED(CONFIG_SPL_GPIO)
+
+#include <asm/arch-rockchip/cru.h>
static void rk3399_force_power_on_reset(void)
{
ofnode node;
@@ -253,27 +255,28 @@ void spl_board_init(void)
{
led_setup();

-#if defined(SPL_GPIO)
- struct rockchip_cru *cru = rockchip_get_cru();
+ if (IS_ENABLED(CONFIG_SPL_GPIO)) {
+ struct rockchip_cru *cru = rockchip_get_cru();

- /*
- * The RK3399 resets only 'almost all logic' (see also in the TRM
- * "3.9.4 Global software reset"), when issuing a software reset.
- * This may cause issues during boot-up for some configurations of
- * the application software stack.
- *
- * To work around this, we test whether the last reset reason was
- * a power-on reset and (if not) issue an overtemp-reset to reset
- * the entire module.
- *
- * While this was previously fixed by modifying the various places
- * that could generate a software reset (e.g. U-Boot's sysreset
- * driver, the ATF or Linux), we now have it here to ensure that
- * we no longer have to track this through the various components.
- */
- if (cru->glb_rst_st != 0)
- rk3399_force_power_on_reset();
-#endif
+ /*
+ * The RK3399 resets only 'almost all logic' (see also in the
+ * TRM "3.9.4 Global software reset"), when issuing a software
+ * reset. This may cause issues during boot-up for some
+ * configurations of the application software stack.
+ *
+ * To work around this, we test whether the last reset reason
+ * was a power-on reset and (if not) issue an overtemp-reset to
+ * reset the entire module.
+ *
+ * While this was previously fixed by modifying the various
+ * places that could generate a software reset (e.g. U-Boot's
+ * sysreset driver, the ATF or Linux), we now have it here to
+ * ensure that we no longer have to track this through the
+ * various components.
+ */
+ if (cru->glb_rst_st != 0)
+ rk3399_force_power_on_reset();
+ }

if (IS_ENABLED(CONFIG_SPL_DM_REGULATOR)) {
/*
--
2.36.1