board/sandburst/common/flash.c: Fix GCC 4.6 build warning

[karo-tx-uboot.git] / board / sandburst / common / ppc440gx_i2c.h

diff --git a/board/sandburst/common/ppc440gx_i2c.h b/board/sandburst/common/ppc440gx_i2c.h
index 10000f5ba9b0bf55058cc249f7198213bec2817d..7496db48405804fcc51fd0fe8c46f73412646fb5 100644 (file)
--- a/board/sandburst/common/ppc440gx_i2c.h
+++ b/board/sandburst/common/ppc440gx_i2c.h
@@ -26,29 +26,29 @@
  * Sandburst Corporation
  */
 #include <common.h>
-#include <ppc4xx.h>
-#include <4xx_i2c.h>
+#include <asm/ppc4xx.h>
+#include <asm/ppc4xx-i2c.h>
 #include <i2c.h>
 
 #ifdef CONFIG_HARD_I2C
 
-#define I2C_BUS1_BASE_ADDR (CFG_PERIPHERAL_BASE + 0x00000500)
+#define I2C_BUS1_BASE_ADDR (CONFIG_SYS_PERIPHERAL_BASE + 0x00000500)
 #define           I2C_REGISTERS_BUS1_BASE_ADDRESS I2C_BUS1_BASE_ADDR
-#define    IIC_MDBUF1  (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICMDBUF)
-#define    IIC_SDBUF1  (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICSDBUF)
-#define    IIC_LMADR1  (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICLMADR)
-#define    IIC_HMADR1  (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICHMADR)
-#define    IIC_CNTL1   (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICCNTL)
-#define    IIC_MDCNTL1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICMDCNTL)
-#define    IIC_STS1    (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICSTS)
-#define    IIC_EXTSTS1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICEXTSTS)
-#define    IIC_LSADR1  (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICLSADR)
-#define    IIC_HSADR1  (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICHSADR)
-#define    IIC_CLKDIV1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICCLKDIV)
-#define    IIC_INTRMSK1        (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICINTRMSK)
-#define    IIC_XFRCNT1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICXFRCNT)
-#define    IIC_XTCNTLSS1       (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICXTCNTLSS)
-#define    IIC_DIRECTCNTL1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICDIRECTCNTL)
+#define    IIC_MDBUF1  (&i2c->mdbuf)
+#define    IIC_SDBUF1  (&i2c->sdbuf)
+#define    IIC_LMADR1  (&i2c->lmadr)
+#define    IIC_HMADR1  (&i2c->hmadr)
+#define    IIC_CNTL1   (&i2c->cntl)
+#define    IIC_MDCNTL1 (&i2c->mdcntl)
+#define    IIC_STS1    (&i2c->sts)
+#define    IIC_EXTSTS1 (&i2c->extsts)
+#define    IIC_LSADR1  (&i2c->lsadr)
+#define    IIC_HSADR1  (&i2c->hsadr)
+#define    IIC_CLKDIV1 (&i2c->clkdiv)
+#define    IIC_INTRMSK1        (&i2c->intrmsk)
+#define    IIC_XFRCNT1 (&i2c->xfrcnt)
+#define    IIC_XTCNTLSS1       (&i2c->xtcntlss)
+#define    IIC_DIRECTCNTL1 (&i2c->directcntl)
 
 void i2c1_init (int speed, int slaveadd);
 int i2c_probe1 (uchar chip);