Blackfin: bf533/bf561 boards: convert to new soft gpio i2c code

Use the new common gpio framework to simplify and unify the soft i2c
configuration settings.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Heiko Schocher <hs@denx.de>

diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 37a70592f8b42f896fe7155d6c018d45d593bb7b..95d3afa85cc5faaf8ff4c82b6c00640dd4eb07be 100644 (file)
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -94,49 +94,10 @@
 
 /*
  * I2C Settings
- * By default PF1 is used as SDA and PF0 as SCL on the Stamp board
  */
 #define CONFIG_SOFT_I2C
-#ifdef CONFIG_SOFT_I2C
-#define PF_SCL PF0
-#define PF_SDA PF1
-#define I2C_INIT \
-       do { \
-               *pFIO_DIR |= PF_SCL; \
-               SSYNC(); \
-       } while (0)
-#define I2C_ACTIVE \
-       do { \
-               *pFIO_DIR |= PF_SDA; \
-               *pFIO_INEN &= ~PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_TRISTATE \
-       do { \
-               *pFIO_DIR &= ~PF_SDA; \
-               *pFIO_INEN |= PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_READ ((*pFIO_FLAG_D & PF_SDA) != 0)
-#define I2C_SDA(bit) \
-       do { \
-               if (bit) \
-                       *pFIO_FLAG_S = PF_SDA; \
-               else \
-                       *pFIO_FLAG_C = PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_SCL(bit) \
-       do { \
-               if (bit) \
-                       *pFIO_FLAG_S = PF_SCL; \
-               else \
-                       *pFIO_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
 
 
 /*

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 02c8bc3c36e8ef2d546cdfdab10772f4d7f7d760..f39bfee0a4fbf32e44c0cd9080f854d80b8007fa 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -138,49 +138,10 @@
 
 /*
  * I2C Settings
- * By default PF2 is used as SDA and PF3 as SCL on the Stamp board
  */
 #define CONFIG_SOFT_I2C
-#ifdef CONFIG_SOFT_I2C
-#define PF_SCL PF3
-#define PF_SDA PF2
-#define I2C_INIT \
-       do { \
-               *pFIO_DIR |= PF_SCL; \
-               SSYNC(); \
-       } while (0)
-#define I2C_ACTIVE \
-       do { \
-               *pFIO_DIR |= PF_SDA; \
-               *pFIO_INEN &= ~PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_TRISTATE \
-       do { \
-               *pFIO_DIR &= ~PF_SDA; \
-               *pFIO_INEN |= PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_READ ((*pFIO_FLAG_D & PF_SDA) != 0)
-#define I2C_SDA(bit) \
-       do { \
-               if (bit) \
-                       *pFIO_FLAG_S = PF_SDA; \
-               else \
-                       *pFIO_FLAG_C = PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_SCL(bit) \
-       do { \
-               if (bit) \
-                       *pFIO_FLAG_S = PF_SCL; \
-               else \
-                       *pFIO_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_PF3
+#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF2
 
 
 /*

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
 
 
 /*

diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 901a32fb725d561cfed482d3ddc674c6e0c9c470..44762689ceb9d20cda68cf5172abea9676c1900c 100644 (file)
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -68,6 +68,7 @@
 # endif
 # if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
 #  define CONFIG_CMD_I2C
+#  define CONFIG_SOFT_I2C_READ_REPEATED_START
 # endif
 # ifdef CONFIG_SYS_NO_FLASH
 #  undef CONFIG_CMD_FLASH

diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index aa33933164a71f8f14a479380bc36c6820ca296b..85f08ea88804dfa1d1bcaa3fdcd64173ee93f07c 100644 (file)
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -206,32 +206,8 @@
  * them yet. You can (and probably should) change these values!
  */
 #ifdef CONFIG_SOFT_I2C
-
-#define PF_SCL                 PF9
-#define PF_SDA                 PF8
-
-#define I2C_INIT       do { *pFIO_DIR |= PF_SCL; SSYNC(); } while (0)
-#define I2C_ACTIVE     do { *pFIO_DIR |= PF_SDA; *pFIO_INEN &= ~PF_SDA; SSYNC(); } while (0)
-#define I2C_TRISTATE   do { *pFIO_DIR &= ~PF_SDA; *pFIO_INEN |= PF_SDA; SSYNC(); } while (0)
-#define I2C_READ       ((*pFIO_FLAG_D & PF_SDA) != 0)
-#define I2C_SDA(bit) \
-       do { \
-               if (bit) \
-                       *pFIO_FLAG_S = PF_SDA; \
-               else \
-                       *pFIO_FLAG_C = PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_SCL(bit) \
-       do { \
-               if (bit) \
-                       *pFIO_FLAG_S = PF_SCL; \
-               else \
-                       *pFIO_FLAG_C = PF_SCL; \
-               SSYNC(); \
-       } while (0)
-#define I2C_DELAY              udelay(5)       /* 1/4 I2C clock duration */
-
+#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF9
+#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF8
 #define CONFIG_SYS_I2C_SPEED           50000
 #define CONFIG_SYS_I2C_SLAVE           0xFE
 #endif

diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 2c0a263da293c6e6b36cde1a1304336d0910628f..53b5197112ed10bcd3eec35128d7f3735305a114 100644 (file)
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -112,33 +112,8 @@
  * I2C Settings
  */
 #define CONFIG_SOFT_I2C                1
-#define PF_SCL                 0x1/*PF0*/
-#define PF_SDA                 0x2/*PF1*/
-
-#ifdef CONFIG_SOFT_I2C
-#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
 
 
 /*