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.
This commit is contained in:
@@ -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;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user