[U-Boot] [PATCH] ARM: mach-omap2: Don't initialize I2C if DM_I2C is enabled

[U-Boot] [PATCH] ARM: mach-omap2: Don't initialize I2C if DM_I2C is enabled

[Adam Ford]

boot-common.c checks to see if I2C is enabled in SPL, but
it doens't check for DM_I2C before initializing it.  This
will now only initialize the I2C is the DM_I2C is not enabled
to avoid initializing it more than once.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index d4a1e2e42c..176d4f67cb 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -202,7 +202,7 @@ void spl_board_init(void)
 #if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT)
 	gpmc_init();
 #endif
-#ifdef CONFIG_SPL_I2C_SUPPORT
+#if defined(CONFIG_SPL_I2C_SUPPORT) && !defined(CONFIG_DM_I2C)
 	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 #if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW_SUPPORT)
-- 
2.17.1

[U-Boot] [PATCH] ARM: mach-omap2: Don't initialize I2C if DM_I2C is enabled

[Simon Glass]

On 20 August 2018 at 19:34, Adam Ford <aford173@gmail.com> wrote:
> boot-common.c checks to see if I2C is enabled in SPL, but
> it doens't check for DM_I2C before initializing it.  This
> will now only initialize the I2C is the DM_I2C is not enabled
> to avoid initializing it more than once.
>
> Signed-off-by: Adam Ford <aford173@gmail.com>

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] ARM: mach-omap2: Don't initialize I2C if DM_I2C is enabled

[Tom Rini]

On Mon, Aug 20, 2018 at 08:34:00PM -0500, Adam Ford wrote:

> boot-common.c checks to see if I2C is enabled in SPL, but
> it doens't check for DM_I2C before initializing it.  This
> will now only initialize the I2C is the DM_I2C is not enabled
> to avoid initializing it more than once.
> 
> Signed-off-by: Adam Ford <aford173@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> 
> diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
> index d4a1e2e42c..176d4f67cb 100644

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180918/44deb91a/attachment.sig>