Message ID | 20220722093014.3850165-1-foss+uboot@0leil.net |
---|---|
State | Accepted |
Delegated to: | Kever Yang |
Headers | show |
Series | [v3,1/2] rockchip: rk3399: fix incorrect ifdef check on SPL_DM_REGULATOR | expand |
Hi all, Gentle ping on the series. Cheers, Quentin On 7/22/22 11:30, Quentin Schulz wrote: > 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
On Fri, Jul 22, 2022 at 3:00 PM 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. 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> > --- Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
On Fri, Jul 22, 2022 at 10:30 AM 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. 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> > --- For the series: Reviewed-by: Peter Robinson <pbrobinson@gmail.com> Tested-by: Peter Robinson <pbrobinson@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 >
On 2022/7/22 17:30, Quentin Schulz wrote: > 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> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > > 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
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