diff options
Diffstat (limited to 'arch/arm/plat-nomadik/include/plat/i2c.h')
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/i2c.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/i2c.h b/arch/arm/plat-nomadik/include/plat/i2c.h index 1621db67a53d..8ba70ffc31ec 100644 --- a/arch/arm/plat-nomadik/include/plat/i2c.h +++ b/arch/arm/plat-nomadik/include/plat/i2c.h | |||
@@ -11,8 +11,8 @@ | |||
11 | enum i2c_freq_mode { | 11 | enum i2c_freq_mode { |
12 | I2C_FREQ_MODE_STANDARD, /* up to 100 Kb/s */ | 12 | I2C_FREQ_MODE_STANDARD, /* up to 100 Kb/s */ |
13 | I2C_FREQ_MODE_FAST, /* up to 400 Kb/s */ | 13 | I2C_FREQ_MODE_FAST, /* up to 400 Kb/s */ |
14 | I2C_FREQ_MODE_HIGH_SPEED, /* up to 3.4 Mb/s */ | ||
14 | I2C_FREQ_MODE_FAST_PLUS, /* up to 1 Mb/s */ | 15 | I2C_FREQ_MODE_FAST_PLUS, /* up to 1 Mb/s */ |
15 | I2C_FREQ_MODE_HIGH_SPEED /* up to 3.4 Mb/s */ | ||
16 | }; | 16 | }; |
17 | 17 | ||
18 | /** | 18 | /** |
@@ -24,13 +24,15 @@ enum i2c_freq_mode { | |||
24 | * to the values of 14, 6, 2 for a 48 MHz i2c clk | 24 | * to the values of 14, 6, 2 for a 48 MHz i2c clk |
25 | * @tft: Tx FIFO Threshold in bytes | 25 | * @tft: Tx FIFO Threshold in bytes |
26 | * @rft: Rx FIFO Threshold in bytes | 26 | * @rft: Rx FIFO Threshold in bytes |
27 | * @timeout Slave response timeout(ms) | ||
27 | * @sm: speed mode | 28 | * @sm: speed mode |
28 | */ | 29 | */ |
29 | struct nmk_i2c_controller { | 30 | struct nmk_i2c_controller { |
30 | unsigned long clk_freq; | 31 | unsigned long clk_freq; |
31 | unsigned short slsu; | 32 | unsigned short slsu; |
32 | unsigned char tft; | 33 | unsigned char tft; |
33 | unsigned char rft; | 34 | unsigned char rft; |
35 | int timeout; | ||
34 | enum i2c_freq_mode sm; | 36 | enum i2c_freq_mode sm; |
35 | }; | 37 | }; |
36 | 38 | ||