i2c, soft-i2c: switch to new multibus/multiadapter support

[J-u-boot.git] / include / configs / TQM866M.h

diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 7d0ae99cb1f47926d43cb774ce7858f5fb67de20..910497126fb39b59464eec10b99f17be7077a534 100644 (file)
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -107,13 +107,11 @@
 #undef CONFIG_CAN_DRIVER               /* CAN Driver support disabled  */
 
 /* enable I2C and select the hardware/software driver */
 #undef CONFIG_CAN_DRIVER               /* CAN Driver support disabled  */
 
 /* enable I2C and select the hardware/software driver */

-#undef CONFIG_HARD_I2C                 /* I2C with hardware support    */
-#define CONFIG_SOFT_I2C                1       /* I2C bit-banged               */
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT                    /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      93000   /* 93 kHz is supposed to work */
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0xFE

 
 

-#define CONFIG_SYS_I2C_SPEED           93000   /* 93 kHz is supposed to work   */
-#define CONFIG_SYS_I2C_SLAVE           0xFE
-
-#ifdef CONFIG_SOFT_I2C

 /*
  * Software (bit-bang) I2C driver configuration
  */
 /*
  * Software (bit-bang) I2C driver configuration
  */


@@ -129,7 +127,6 @@
 #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(2)       /* 1/4 I2C clock duration */
 #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(2)       /* 1/4 I2C clock duration */

-#endif /* CONFIG_SOFT_I2C */

 
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50            /* EEPROM AT24C256      */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2               /* two byte address     */
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50            /* EEPROM AT24C256      */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2               /* two byte address     */