[Uboot-stm32] [PATCH 06/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in dk2_i2c1_fix

[Patrice CHOTARD]

Hi Patrick

On 7/31/20 4:31 PM, Patrick Delaunay wrote:
> Use IS_ENABLED to prevent ifdef in dk2_i2c1_fix.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
> ---
>
>  board/st/stm32mp1/stm32mp1.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
> index a0a2f9978f..985233f2b3 100644
> --- a/board/st/stm32mp1/stm32mp1.c
> +++ b/board/st/stm32mp1/stm32mp1.c
> @@ -521,7 +521,6 @@ static void sysconf_init(void)
>  	clrbits_le32(syscfg + SYSCFG_CMPCR, SYSCFG_CMPCR_SW_CTRL);
>  }
>  
> -#ifdef CONFIG_DM_REGULATOR
>  /* Fix to make I2C1 usable on DK2 for touchscreen usage in kernel */
>  static int dk2_i2c1_fix(void)
>  {
> @@ -529,6 +528,9 @@ static int dk2_i2c1_fix(void)
>  	struct gpio_desc hdmi, audio;
>  	int ret = 0;
>  
> +	if (!IS_ENABLED(CONFIG_DM_REGULATOR))
> +		return -ENODEV;
> +
>  	node = ofnode_path("/soc/i2c at 40012000/hdmi-transmitter at 39");
>  	if (!ofnode_valid(node)) {
>  		pr_debug("%s: no hdmi-transmitter at 39 ?\n", __func__);
> @@ -586,7 +588,6 @@ static bool board_is_dk2(void)
>  
>  	return false;
>  }
> -#endif
>  
>  static bool board_is_ev1(void)
>  {
> @@ -634,12 +635,11 @@ int board_init(void)
>  	if (board_is_ev1())
>  		board_ev1_init();
>  
> -#ifdef CONFIG_DM_REGULATOR
>  	if (board_is_dk2())
>  		dk2_i2c1_fix();
>  
> -	regulators_enable_boot_on(_DEBUG);
> -#endif
> +	if (IS_ENABLED(CONFIG_DM_REGULATOR))
> +		regulators_enable_boot_on(_DEBUG);
>  
>  	if (!IS_ENABLED(CONFIG_TFABOOT))
>  		sysconf_init();

Reviewed-by: Patrice Chotard <patrice.chotard at st.com>

Thanks

Patrice