Merge branch 'next' of ../custodians into next

[u-boot] / include / configs / bf533-stamp.h

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index d5e82cae1b835cabbb57048b814b14784dac51cc..f39bfee0a4fbf32e44c0cd9080f854d80b8007fa 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -138,51 +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 */
-
-#define CONFIG_SYS_I2C_SPEED           50000
-#define CONFIG_SYS_I2C_SLAVE           0
-#endif
+#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF3
+#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF2
 
 
 /*
@@ -230,17 +189,19 @@
 /* define to enable run status via led */
 /* #define CONFIG_STATUS_LED */
 #ifdef CONFIG_STATUS_LED
+#define CONFIG_GPIO_LED
 #define CONFIG_BOARD_SPECIFIC_LED
-/* use LED1 to indicate booting/alive */
+/* use LED0 to indicate booting/alive */
 #define STATUS_LED_BOOT 0
-#define STATUS_LED_BIT 1
+#define STATUS_LED_BIT GPIO_PF2
 #define STATUS_LED_STATE STATUS_LED_ON
 #define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 4)
-/* use LED2 to indicate crash */
+/* use LED1 to indicate crash */
 #define STATUS_LED_CRASH 1
-#define STATUS_LED_BIT1 2
+#define STATUS_LED_BIT1 GPIO_PF3
 #define STATUS_LED_STATE1 STATUS_LED_ON
 #define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2)
+/* #define STATUS_LED_BIT2 GPIO_PF4 */
 #endif
 
 /* define to enable splash screen support */