diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 16:15:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 16:15:59 -0400 |
| commit | d32f60ed54351ebdea8ae6fbfa0d26e93de29252 (patch) | |
| tree | 12003ebca48d03d68aa725b68c7cbdc2c432e2ee /include/linux/i2c-ocores.h | |
| parent | a2ee2981ae2a7046b10980feae9f4ab813877106 (diff) | |
| parent | dd14be4c274fc484eccace03ae9726e516630331 (diff) | |
Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c-ocores: Can add I2C devices to the bus
i2c-s3c2410: move to using platform idtable to match devices
i2c: OMAP3: Better noise suppression for fast/standard modes
i2c: OMAP2/3: Fix scll/sclh calculations
i2c: Blackfin TWI: implement I2C_FUNC_SMBUS_I2C_BLOCK functionality
i2c: Blackfin TWI: fix transfer errors with repeat start
i2c: Blackfin TWI: fix REPEAT START mode doesn't repeat
i2c: Blackfin TWI: make sure we don't end up with a CLKDIV=0
Diffstat (limited to 'include/linux/i2c-ocores.h')
| -rw-r--r-- | include/linux/i2c-ocores.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/i2c-ocores.h b/include/linux/i2c-ocores.h index 8ed591b0887e..4d5e57ff6614 100644 --- a/include/linux/i2c-ocores.h +++ b/include/linux/i2c-ocores.h | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | struct ocores_i2c_platform_data { | 14 | struct ocores_i2c_platform_data { |
| 15 | u32 regstep; /* distance between registers */ | 15 | u32 regstep; /* distance between registers */ |
| 16 | u32 clock_khz; /* input clock in kHz */ | 16 | u32 clock_khz; /* input clock in kHz */ |
| 17 | u8 num_devices; /* number of devices in the devices list */ | ||
| 18 | struct i2c_board_info const *devices; /* devices connected to the bus */ | ||
| 17 | }; | 19 | }; |
| 18 | 20 | ||
| 19 | #endif /* _LINUX_I2C_OCORES_H */ | 21 | #endif /* _LINUX_I2C_OCORES_H */ |