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

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

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 2962c915aa0d548d0e002aa3c8ba7e38ca76b185..06c0e50c9665e6db2392e4a7842b53e5c3528488 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -142,26 +142,33 @@
 /*
  * Enable I2C and select the hardware/software driver
  */
-#define CONFIG_HARD_I2C                1                               /* CPM based I2C                        */
-#undef CONFIG_SOFT_I2C                                         /* Bit-banged I2C                       */
+#define CONFIG_HARD_I2C                1               /* CPM based I2C */
+#undef CONFIG_SYS_I2C_SOFT                     /* Bit-banged I2C */
 
 #ifdef CONFIG_HARD_I2C
-#define        CONFIG_SYS_I2C_SPEED            100000                  /* clock speed in Hz            */
-#define CONFIG_SYS_I2C_SLAVE           0xFE                    /* I2C slave address            */
+#define        CONFIG_SYS_I2C_SPEED            100000  /* clock speed in Hz */
+#define CONFIG_SYS_I2C_SLAVE           0xFE    /* I2C slave address */
 #endif
 
-#ifdef CONFIG_SOFT_I2C
-#define PB_SCL                         0x00000020              /* PB 26                                        */
-#define PB_SDA                         0x00000010              /* PB 27                                        */
-#define I2C_INIT                       (immr->im_cpm.cp_pbdir |=  PB_SCL)
-#define I2C_ACTIVE                     (immr->im_cpm.cp_pbdir |=  PB_SDA)
-#define I2C_TRISTATE           (immr->im_cpm.cp_pbdir &= ~PB_SDA)
-#define I2C_READ                       ((immr->im_cpm.cp_pbdat & PB_SDA) != 0)
-#define I2C_SDA(bit)           if(bit) immr->im_cpm.cp_pbdat |=  PB_SDA; \
-                                                               else    immr->im_cpm.cp_pbdat &= ~PB_SDA
-#define I2C_SCL(bit)           if(bit) immr->im_cpm.cp_pbdat |=  PB_SCL; \
-                                                               else    immr->im_cpm.cp_pbdat &= ~PB_SCL
-#define I2C_DELAY                      udelay(5)               /* 1/4 I2C clock duration       */
+#ifdef CONFIG_SYS_I2C_SOFT
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT_SPEED      50000
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0xFE
+#define PB_SCL         0x00000020              /* PB 26 */
+#define PB_SDA         0x00000010              /* PB 27 */
+#define I2C_INIT       (immr->im_cpm.cp_pbdir |=  PB_SCL)
+#define I2C_ACTIVE     (immr->im_cpm.cp_pbdir |=  PB_SDA)
+#define I2C_TRISTATE   (immr->im_cpm.cp_pbdir &= ~PB_SDA)
+#define I2C_READ       ((immr->im_cpm.cp_pbdat & PB_SDA) != 0)
+#define I2C_SDA(bit)   if (bit) \
+                               immr->im_cpm.cp_pbdat |=  PB_SDA; \
+                       else \
+                               immr->im_cpm.cp_pbdat &= ~PB_SDA
+#define I2C_SCL(bit)   if (bit) \
+                               immr->im_cpm.cp_pbdat |=  PB_SCL; \
+                       else \
+                               immr->im_cpm.cp_pbdat &= ~PB_SCL
+#define I2C_DELAY      udelay(5) /* 1/4 I2C clock duration */
 #endif
 
 /*