diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-04-03 22:02:31 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-04-03 22:02:31 +0300 |
| commit | 165fe9c9cd5d1cbc3165dc2e0b24d96314186f8c (patch) | |
| tree | 35f1cc9d028e7531edd623b352d051f386871023 /include | |
| parent | 03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8 (diff) | |
| parent | 4124c4eba40256b65acb5016a1edfdd59a1960b6 (diff) | |
| download | linux-165fe9c9cd5d1cbc3165dc2e0b24d96314186f8c.tar.xz | |
Merge branch 'ib/4.11-rc3-i2c-irq-resources' into next
Bring in changes to i2c to better manage device properties and to allow
specifying client interrupt through a resource structure.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 6b183521c616..c5bd8b8daf97 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -38,6 +38,7 @@ extern struct bus_type i2c_bus_type; extern struct device_type i2c_adapter_type; +extern struct device_type i2c_client_type; /* --- General options ------------------------------------------------ */ @@ -303,6 +304,8 @@ static inline int i2c_slave_event(struct i2c_client *client, * @of_node: pointer to OpenFirmware device node * @fwnode: device node supplied by the platform firmware * @properties: additional device properties for the device + * @resources: resources associated with the device + * @num_resources: number of resources in the @resources array * @irq: stored in i2c_client.irq * * I2C doesn't actually support hardware probing, although controllers and @@ -325,6 +328,8 @@ struct i2c_board_info { struct device_node *of_node; struct fwnode_handle *fwnode; const struct property_entry *properties; + const struct resource *resources; + unsigned int num_resources; int irq; }; |