From: Heiko Schocher <hs@denx.de>
Date: Fri, 17 Sep 2010 11:10:37 +0000 (+0200)
Subject: i2c, omap24xx: set bus_initialized only after relocation.
X-Git-Tag: v2010.12-rc1~174^2~51
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1724fe9adfed43c92605b139d4a71f2f4a52c734;p=u-boot

i2c, omap24xx: set bus_initialized only after relocation.

Portions of this work were supported by funding from
the CE Linux Forum.

Signed-off-by: Heiko Schocher <hs@denx.de>
---

diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index a7c4e69a64..3febd1ff63 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -40,6 +40,7 @@ static unsigned int current_bus;
 
 void i2c_init (int speed, int slaveadd)
 {
+	DECLARE_GLOBAL_DATA_PTR;
 	int psc, fsscll, fssclh;
 	int hsscll = 0, hssclh = 0;
 	u32 scll, sclh;
@@ -139,7 +140,8 @@ void i2c_init (int speed, int slaveadd)
 	writew (0xFFFF, &i2c_base->stat);
 	writew (0, &i2c_base->cnt);
 
-	bus_initialized[current_bus] = 1;
+	if (gd->flags & GD_FLG_RELOC)
+		bus_initialized[current_bus] = 1;
 }
 
 static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)