From: Samuel Holland Date: Fri, 8 Oct 2021 05:17:17 +0000 (-0500) Subject: sunxi: Only initialize legacy I2C when enabled X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=ea261fdeb23d54ee17a5e5a95cf35f97180deb76;p=u-boot.git sunxi: Only initialize legacy I2C when enabled CONFIG_SPL_I2C is the wrong symbol to use here. It is the top-level Kconfig symbol (not specific to either legacy or DM I2C), whereas the i2c_init() function is specific to legacy I2C. This change fixes a build failure when enabling SPL_I2C but not SPL_SYS_I2C_LEGACY. Signed-off-by: Samuel Holland Reviewed-by: Andre Przywara Signed-by: Andre Przywara --- diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 373cb56db4..b4ba2a72c4 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -338,7 +338,7 @@ void board_init_f(ulong dummy) spl_init(); preloader_console_init(); -#ifdef CONFIG_SPL_I2C +#if CONFIG_IS_ENABLED(I2C) && CONFIG_IS_ENABLED(SYS_I2C_LEGACY) /* Needed early by sunxi_board_init if PMU is enabled */ i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); #endif