Merge 'next' branch

[oweals/u-boot.git] / board / sandburst / common / ppc440gx_i2c.h

diff --git a/board/sandburst/common/ppc440gx_i2c.h b/board/sandburst/common/ppc440gx_i2c.h
index e25a3171a7a2bb979677efdfe4821b883c178c15..328abd64b8975a8b42653ea94f75e5b97b2f9628 100644 (file)
--- a/board/sandburst/common/ppc440gx_i2c.h
+++ b/board/sandburst/common/ppc440gx_i2c.h
@@ -27,19 +27,12 @@
  */
 #include <common.h>
 #include <ppc4xx.h>
-#if defined(CONFIG_440)
-#   include <440_i2c.h>
-#else
-#   include <405gp_i2c.h>
-#endif
+#include <4xx_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)
@@ -64,4 +57,4 @@ int i2c_write1 (uchar chip, uint addr, int alen, uchar * buffer, int len);
 uchar i2c_reg_read1(uchar i2c_addr, uchar reg);
 void i2c_reg_write1(uchar i2c_addr, uchar reg, uchar val);
 
-#endif
+#endif /* CONFIG_HARD_I2C */