Merge branch 'master' of /home/wd/git/u-boot/master

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

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 036bfe412faa7ffea9b777202e38071a6800c75e..4e293b58a820f5e73154e6b6d2c1986fabf1e3b4 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -112,46 +112,8 @@
  * I2C Settings
  */
 #define CONFIG_SOFT_I2C
-#ifdef CONFIG_SOFT_I2C
-#define PF_SCL PF0
-#define PF_SDA PF1
-#define I2C_INIT \
-       do { \
-               *pFIO0_DIR |= PF_SCL; \
-               SSYNC(); \
-       } while (0)
-#define I2C_ACTIVE \
-       do { \
-               *pFIO0_DIR |= PF_SDA; \
-               *pFIO0_INEN &= ~PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_TRISTATE \
-       do { \
-               *pFIO0_DIR &= ~PF_SDA; \
-               *pFIO0_INEN |= PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_READ ((*pFIO0_FLAG_D & PF_SDA) != 0)
-#define I2C_SDA(bit) \
-       do { \
-               if (bit) \
-                       *pFIO0_FLAG_S = PF_SDA; \
-               else \
-                       *pFIO0_FLAG_C = PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_SCL(bit) \
-       do { \
-               if (bit) \
-                       *pFIO0_FLAG_S = PF_SCL; \
-               else \
-                       *pFIO0_FLAG_C = PF_SCL; \
-               SSYNC(); \
-       } while (0)
-#define I2C_DELAY              udelay(5)       /* 1/4 I2C clock duration */
-
-#endif
+#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF0
+#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF1
 
 
 /*