summaryrefslogtreecommitdiff
path: root/include/linux/i2c.h
diff options
context:
space:
mode:
authorWolfram Sang <wsa@kernel.org>2021-04-10 21:48:34 +0200
committerWolfram Sang <wsa@kernel.org>2021-04-10 21:48:34 +0200
commit2375843b50d6139b82648499daaad2034576905b (patch)
tree321fd890f3eeeda1f8ae38fef6312e6d959f5aba /include/linux/i2c.h
parent660f58b6d290417828680f417f43d7b810fa9138 (diff)
parent4b2b4cc50ba6d607d1611ea6b2046a58d16e45eb (diff)
Merge branch 'i2c/software-nodes' into i2c/for-5.13
Diffstat (limited to 'include/linux/i2c.h')
-rw-r--r--include/linux/i2c.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index a670ae129f4b..59b892c5bb05 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -391,7 +391,7 @@ static inline bool i2c_detect_slave_mode(struct device *dev) { return false; }
* @platform_data: stored in i2c_client.dev.platform_data
* @of_node: pointer to OpenFirmware device node
* @fwnode: device node supplied by the platform firmware
- * @properties: additional device properties for the device
+ * @swnode: software node for the device
* @resources: resources associated with the device
* @num_resources: number of resources in the @resources array
* @irq: stored in i2c_client.irq
@@ -415,7 +415,7 @@ struct i2c_board_info {
void *platform_data;
struct device_node *of_node;
struct fwnode_handle *fwnode;
- const struct property_entry *properties;
+ const struct software_node *swnode;
const struct resource *resources;
unsigned int num_resources;
int irq;