Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / arm / plat-nomadik / include / plat / i2c.h

diff --git a/arch/arm/plat-nomadik/include/plat/i2c.h b/arch/arm/plat-nomadik/include/plat/i2c.h
index 1621db6..8ba70ff 100644 (file)
--- a/arch/arm/plat-nomadik/include/plat/i2c.h
+++ b/arch/arm/plat-nomadik/include/plat/i2c.h
@@ -11,8 +11,8 @@
 enum i2c_freq_mode {
        I2C_FREQ_MODE_STANDARD,         /* up to 100 Kb/s */
        I2C_FREQ_MODE_FAST,             /* up to 400 Kb/s */
+       I2C_FREQ_MODE_HIGH_SPEED,       /* up to 3.4 Mb/s */
        I2C_FREQ_MODE_FAST_PLUS,        /* up to 1 Mb/s */
-       I2C_FREQ_MODE_HIGH_SPEED        /* up to 3.4 Mb/s */
 };
 
 /**
@@ -24,13 +24,15 @@ enum i2c_freq_mode {
  *             to the values of 14, 6, 2 for a 48 MHz i2c clk
  * @tft:       Tx FIFO Threshold in bytes
  * @rft:       Rx FIFO Threshold in bytes
+ * @timeout    Slave response timeout(ms)
  * @sm:                speed mode
  */
 struct nmk_i2c_controller {
        unsigned long   clk_freq;
        unsigned short  slsu;
-       unsigned char   tft;
-       unsigned char   rft;
+       unsigned char   tft;
+       unsigned char   rft;
+       int timeout;
        enum i2c_freq_mode      sm;
 };