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

Peter Robinson pbrobinson at gmail.com
Sun Aug 21 13:04:44 CEST 2022


On Fri, Jul 22, 2022 at 10:30 AM Quentin Schulz <foss+uboot at 0leil.net> wrote:
>
> From: Quentin Schulz <quentin.schulz at 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 at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
> ---

For the series:
Reviewed-by: Peter Robinson <pbrobinson at gmail.com>
Tested-by: Peter Robinson <pbrobinson at gmail.com> # Rock960


> 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
>


More information about the U-Boot mailing list