diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 15:41:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 15:41:50 -0500 |
| commit | 295324556c427d60b41668ab81a43f604533f456 (patch) | |
| tree | a9a9acc5f790ba7093ee61a295bba7ac1f54a298 /include | |
| parent | 18a8d49973667aa016e68826eeb374788b7c63b0 (diff) | |
| parent | 0d8fb59924cf20e7bef2c41f8d4e87127f573546 (diff) | |
Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang:
"Summary:
- legacy PM code removed from the core, there were no users anymore
(thanks to Lars-Peter Clausen)
- new driver for Broadcom iProc
- bigger driver updates for designware, rk3x, cadence, ocores
- a bunch of smaller updates and bugfixes"
* 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (31 commits)
i2c: ocores: rework clk code to handle NULL cookie
i2c: designware-baytrail: another fixup for proper Kconfig dependencies
i2c: fix reference to functionality constants definition
i2c: iproc: Add Broadcom iProc I2C Driver
i2c: designware-pci: update Intel copyright line
i2c: ocores: add common clock support
i2c: hix5hd2: add COMPILE_TEST
i2c: clarify comments about the dev_released completion
i2c: ocores: fix clock-frequency binding usage
i2c: tegra: Maintain CPU endianness
i2c: designware-baytrail: use proper Kconfig dependencies
i2c: designware: Do not calculate SCL timing parameters needlessly
i2c: do not try to load modules for of-registered devices
i2c: designware: Add Intel Baytrail PMIC I2C bus support
i2c: designware: Add i2c bus locking support
of: i2c: Add i2c-mux-idle-disconnect DT property to PCA954x mux driver
i2c: designware: use {readl|writel}_relaxed instead of readl/writel
i2c: designware-pci: no need to provide clk_khz
i2c: designware-pci: remove Moorestown support
i2c: imx: whitespace and checkpatch cleanup
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 7c7695940ddd..f17da50402a4 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -130,8 +130,6 @@ extern s32 i2c_smbus_write_i2c_block_data(const struct i2c_client *client, | |||
| 130 | * @probe: Callback for device binding | 130 | * @probe: Callback for device binding |
| 131 | * @remove: Callback for device unbinding | 131 | * @remove: Callback for device unbinding |
| 132 | * @shutdown: Callback for device shutdown | 132 | * @shutdown: Callback for device shutdown |
| 133 | * @suspend: Callback for device suspend | ||
| 134 | * @resume: Callback for device resume | ||
| 135 | * @alert: Alert callback, for example for the SMBus alert protocol | 133 | * @alert: Alert callback, for example for the SMBus alert protocol |
| 136 | * @command: Callback for bus-wide signaling (optional) | 134 | * @command: Callback for bus-wide signaling (optional) |
| 137 | * @driver: Device driver model driver | 135 | * @driver: Device driver model driver |
| @@ -174,8 +172,6 @@ struct i2c_driver { | |||
| 174 | 172 | ||
| 175 | /* driver model interfaces that don't relate to enumeration */ | 173 | /* driver model interfaces that don't relate to enumeration */ |
| 176 | void (*shutdown)(struct i2c_client *); | 174 | void (*shutdown)(struct i2c_client *); |
| 177 | int (*suspend)(struct i2c_client *, pm_message_t mesg); | ||
| 178 | int (*resume)(struct i2c_client *); | ||
| 179 | 175 | ||
| 180 | /* Alert callback, for example for the SMBus alert protocol. | 176 | /* Alert callback, for example for the SMBus alert protocol. |
| 181 | * The format and meaning of the data value depends on the protocol. | 177 | * The format and meaning of the data value depends on the protocol. |