[PATCH 1/2] rockchip: rk3399: fix incorrect ifdef check on SPL_DM_REGULATOR

[PATCH 1/2] rockchip: rk3399: fix incorrect ifdef check on SPL_DM_REGULATOR

[Quentin Schulz]

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

The check to perform is on CONFIG_SPL_DM_REGULATOR and not
SPL_DM_REGULATOR.

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>
---
 arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index de11a3fa30..ad274b66ce 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -275,7 +275,7 @@ void spl_board_init(void)
 		rk3399_force_power_on_reset();
 #endif
 
-#if defined(SPL_DM_REGULATOR)
+#if defined(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).
-- 
2.36.1

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

[Quentin Schulz]

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.

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>
---
 arch/arm/mach-rockchip/rk3399/rk3399.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index ad274b66ce..6d30b70565 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 defined(CONFIG_SPL_GPIO)
+
+#include <asm/arch-rockchip/cru.h>
 static void rk3399_force_power_on_reset(void)
 {
 	ofnode node;
@@ -253,7 +255,7 @@ void spl_board_init(void)
 {
 	led_setup();
 
-#if defined(SPL_GPIO)
+#if defined(CONFIG_SPL_GPIO)
 	struct rockchip_cru *cru = rockchip_get_cru();
 
 	/*
-- 
2.36.1

Re: [PATCH 1/2] rockchip: rk3399: fix incorrect ifdef check on SPL_DM_REGULATOR

[Philipp Tomsich]

On Tue, 12 Jul 2022 at 17:38, Quentin Schulz <foss+uboot@0leil.net> wrote:
>
> From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>
> The check to perform is on CONFIG_SPL_DM_REGULATOR and not
> SPL_DM_REGULATOR.
>
> 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>
> ---
>  arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
> index de11a3fa30..ad274b66ce 100644
> --- a/arch/arm/mach-rockchip/rk3399/rk3399.c
> +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
> @@ -275,7 +275,7 @@ void spl_board_init(void)
>                 rk3399_force_power_on_reset();
>  #endif
>
> -#if defined(SPL_DM_REGULATOR)
> +#if defined(CONFIG_SPL_DM_REGULATOR)

This should use IS_ENABLED(...) or CONFIG_IS_ENABLED(...) and be a
regular if-block instead of an #ifdef.

>         /*
>          * Turning the eMMC and SPI back on (if disabled via the Qseven
>          * BIOS_ENABLE) signal is done through a always-on regulator).
> --
> 2.36.1
>

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

[Philipp Tomsich]

On Tue, 12 Jul 2022 at 17:38, Quentin Schulz <foss+uboot@0leil.net> wrote:
>
> 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.
>
> 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>
> ---
>  arch/arm/mach-rockchip/rk3399/rk3399.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
> index ad274b66ce..6d30b70565 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 defined(CONFIG_SPL_GPIO)

#if IS_ENABLED(…)

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

if (IS_ENABLED(…)) { }

>         struct rockchip_cru *cru = rockchip_get_cru();
>
>         /*
> --
> 2.36.1
>