[U-Boot] [PATCH 10/26] i2c, omap24xx: set bus_initialized only after relocation.

[U-Boot] [PATCH 10/26] i2c, omap24xx: set bus_initialized only after relocation.

[Heiko Schocher]

Signed-off-by: Heiko Schocher <hs@denx.de>
---
- changes since v1:
  - changed commit message

 drivers/i2c/omap24xx_i2c.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 3256133..15ad39a 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -38,6 +38,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;
@@ -127,7 +128,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)
-- 
1.6.2.5

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany