Merge branch 'master' of git://git.denx.de/u-boot-i2c

[karo-tx-uboot.git] / include / configs / MPC8349ITX.h

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index f9949a8000328a45912d70775736a45bed905d39..c3a577f40a1cad07d9df7632de237f11bf88db7b 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -74,7 +74,7 @@
 
 #define CONFIG_PCI
 #define CONFIG_RTC_DS1337
-#define CONFIG_HARD_I2C
+#define CONFIG_SYS_I2C
 #define CONFIG_TSEC_ENET               /* TSEC Ethernet support */
 
 /*
@@ -82,12 +82,15 @@
  */
 
 /* I2C */
-#ifdef CONFIG_HARD_I2C
+#ifdef CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_FSL
+#define CONFIG_SYS_FSL_I2C_SPEED       400000
+#define CONFIG_SYS_FSL_I2C_SLAVE       0x7F
+#define CONFIG_SYS_FSL_I2C_OFFSET      0x3000
+#define CONFIG_SYS_FSL_I2C2_SPEED      400000
+#define CONFIG_SYS_FSL_I2C2_SLAVE      0x7F
+#define CONFIG_SYS_FSL_I2C2_OFFSET     0x3100
 
-#define CONFIG_FSL_I2C
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_OFFSET          0x3000
-#define CONFIG_SYS_I2C2_OFFSET         0x3100
 #define CONFIG_SYS_SPD_BUS_NUM         1       /* The I2C bus for SPD */
 #define CONFIG_SYS_RTC_BUS_NUM         1       /* The I2C bus for RTC */
 
@@ -99,9 +102,6 @@
 #define CONFIG_SYS_I2C_RTC_ADDR                0x68    /* I2C1, DS1339 RTC*/
 #define SPD_EEPROM_ADDRESS             0x51    /* I2C1, DDR */
 
-#define CONFIG_SYS_I2C_SPEED   400000  /* I2C speed and slave address */
-#define CONFIG_SYS_I2C_SLAVE   0x7F
-
 /* Don't probe these addresses: */
 #define CONFIG_SYS_I2C_NOPROBES        { {1, CONFIG_SYS_I2C_8574_ADDR1}, \
                                 {1, CONFIG_SYS_I2C_8574_ADDR2}, \
@@ -115,8 +115,6 @@
 #define I2C_8574_PCI66         0x20    /* 0=33MHz PCI, 1=66MHz PCI */
 #define I2C_8574_FLASHSIDE     0x40    /* 0=Reset vector from U4, 1=from U7*/
 
-#undef CONFIG_SOFT_I2C
-
 #endif
 
 /* Compact Flash */
@@ -183,7 +181,7 @@
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED   ((phys_size_t)256 << 20)
 
-#ifdef CONFIG_HARD_I2C
+#ifdef CONFIG_SYS_I2C
 #define CONFIG_SPD_EEPROM              /* use SPD EEPROM for DDR setup*/
 #endif
 
@@ -529,7 +527,7 @@ boards, we say we have two, but don't display a message if we find only one. */
        #define CONFIG_CMD_PCI
 #endif
 
-#ifdef CONFIG_HARD_I2C
+#ifdef CONFIG_SYS_I2C
        #define CONFIG_CMD_I2C
 #endif