From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 6 Oct 2008 07:49:32 +0000 (-0400)
Subject: Blackfin: do not init i2c in Blackfin board init
X-Git-Tag: v2009.03-rc1~147^2~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6882b5a79a3247494b62c05015fa672557f1bfaa;p=oweals%2Fu-boot.git

Blackfin: do not init i2c in Blackfin board init

The common code takes care of calling i2c_init() when needed, so no point
in us doing it as well.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c
index ddf8144288..30ffba1c0f 100644
--- a/lib_blackfin/board.c
+++ b/lib_blackfin/board.c
@@ -13,7 +13,6 @@
 #include <command.h>
 #include <devices.h>
 #include <environment.h>
-#include <i2c.h>
 #include <malloc.h>
 #include <net.h>
 #include <timestamp.h>
@@ -331,16 +330,6 @@ void board_init_f(ulong bootflag)
 	board_init_r((gd_t *) gd, 0x20000010);
 }
 
-#if defined(CONFIG_SOFT_I2C) || defined(CONFIG_HARD_I2C)
-static int init_func_i2c(void)
-{
-	puts("I2C:   ");
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-	puts("ready\n");
-	return (0);
-}
-#endif
-
 void board_init_r(gd_t * id, ulong dest_addr)
 {
 	extern void malloc_bin_reloc(void);
@@ -442,10 +431,6 @@ void board_init_r(gd_t * id, ulong dest_addr)
 			bd->bi_enetaddr[3], bd->bi_enetaddr[4], bd->bi_enetaddr[5]);
 #endif
 
-#if defined(CONFIG_SOFT_I2C) || defined(CONFIG_HARD_I2C)
-	init_func_i2c();
-#endif
-
 	display_global_data();
 
 #if defined(CONFIG_POST)