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

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

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 3924936a5a652675af96a1bb8aa95d16bb27e651..0307f19ad2c43e488c4fd1c01a2cf1c3aecc2ee4 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -101,12 +101,11 @@
 #endif
 
 /* I2C */
-#define CONFIG_FSL_I2C
-#define CONFIG_HARD_I2C                /* I2C with hw support */
-#undef CONFIG_SOFT_I2C         /* I2C bit-banged */
-#define CONFIG_SYS_I2C_SPEED           80000
-#define CONFIG_SYS_I2C_SLAVE           0x7F
-#define CONFIG_SYS_I2C_OFFSET          0x00008F00
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_FSL
+#define CONFIG_SYS_FSL_I2C_SPEED       80000
+#define CONFIG_SYS_FSL_I2C_SLAVE       0x7F
+#define CONFIG_SYS_FSL_I2C_OFFSET      0x00008F00
 #define CONFIG_SYS_IMMR                CONFIG_SYS_MBAR
 
 /* PCI */