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

[people/ms/u-boot.git] / include / configs / KUP4K.h

diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index 68451baf75f135f09faecefb33086e150d37098f..ef51e35df64bac85e49a044fc45a47359d6b7ecb 100644 (file)
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -90,13 +90,11 @@
 /*
  * enable I2C and select the hardware/software driver
  */
-#undef CONFIG_HARD_I2C         /* I2C with hardware support    */
-#define        CONFIG_SOFT_I2C         /* 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
  */
@@ -112,7 +110,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 */
-#endif /* CONFIG_SOFT_I2C */
 
 /*-----------------------------------------------------------------------
  * I2C Configuration