diff options
Diffstat (limited to 'include/linux/i2c.h')
-rw-r--r-- | include/linux/i2c.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 44ad14e016b5..254cd34eeae2 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -394,7 +394,6 @@ static inline bool i2c_detect_slave_mode(struct device *dev) { return false; } | |||
394 | * @addr: stored in i2c_client.addr | 394 | * @addr: stored in i2c_client.addr |
395 | * @dev_name: Overrides the default <busnr>-<addr> dev_name if set | 395 | * @dev_name: Overrides the default <busnr>-<addr> dev_name if set |
396 | * @platform_data: stored in i2c_client.dev.platform_data | 396 | * @platform_data: stored in i2c_client.dev.platform_data |
397 | * @archdata: copied into i2c_client.dev.archdata | ||
398 | * @of_node: pointer to OpenFirmware device node | 397 | * @of_node: pointer to OpenFirmware device node |
399 | * @fwnode: device node supplied by the platform firmware | 398 | * @fwnode: device node supplied by the platform firmware |
400 | * @properties: additional device properties for the device | 399 | * @properties: additional device properties for the device |
@@ -419,7 +418,6 @@ struct i2c_board_info { | |||
419 | unsigned short addr; | 418 | unsigned short addr; |
420 | const char *dev_name; | 419 | const char *dev_name; |
421 | void *platform_data; | 420 | void *platform_data; |
422 | struct dev_archdata *archdata; | ||
423 | struct device_node *of_node; | 421 | struct device_node *of_node; |
424 | struct fwnode_handle *fwnode; | 422 | struct fwnode_handle *fwnode; |
425 | const struct property_entry *properties; | 423 | const struct property_entry *properties; |
@@ -903,6 +901,9 @@ extern const struct of_device_id | |||
903 | *i2c_of_match_device(const struct of_device_id *matches, | 901 | *i2c_of_match_device(const struct of_device_id *matches, |
904 | struct i2c_client *client); | 902 | struct i2c_client *client); |
905 | 903 | ||
904 | int of_i2c_get_board_info(struct device *dev, struct device_node *node, | ||
905 | struct i2c_board_info *info); | ||
906 | |||
906 | #else | 907 | #else |
907 | 908 | ||
908 | static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) | 909 | static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) |
@@ -927,6 +928,13 @@ static inline const struct of_device_id | |||
927 | return NULL; | 928 | return NULL; |
928 | } | 929 | } |
929 | 930 | ||
931 | static inline int of_i2c_get_board_info(struct device *dev, | ||
932 | struct device_node *node, | ||
933 | struct i2c_board_info *info) | ||
934 | { | ||
935 | return -ENOTSUPP; | ||
936 | } | ||
937 | |||
930 | #endif /* CONFIG_OF */ | 938 | #endif /* CONFIG_OF */ |
931 | 939 | ||
932 | #if IS_ENABLED(CONFIG_ACPI) | 940 | #if IS_ENABLED(CONFIG_ACPI) |