Blackfin: do not init i2c in Blackfin board init
authorMike Frysinger <vapier@gentoo.org>
Mon, 6 Oct 2008 07:49:32 +0000 (03:49 -0400)
committerMike Frysinger <vapier@gentoo.org>
Wed, 28 Jan 2009 18:26:12 +0000 (13:26 -0500)
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>
lib_blackfin/board.c

index ddf8144288363bc651d960bcc1cc416d0932e971..30ffba1c0f25b28c1683f290ab8d68c83fb986d8 100644 (file)
@@ -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)