i2c: add fwnode APIs
Subsystems (4)
PATCH 1/1 i2c: add fwnode APIs
Add fwnode APIs for finding and getting I2C adapters, which will be used by the SFP code. These are passed the fwnode corresponding to the adapter, and return the I2C adapter. It is the responsibility of the caller to find the appropriate fwnode.
We keep the DT and ACPI interfaces, but where appropriate, recode them to use the fwnode interfaces internally.
---
Wolfram,
Please provide an immutable branch for net-next to pull. I assume that as we're doing this, we may as well merge the SFP changes via net-next rather than the i2c tree. If you would still like the SFP changes as well, I can re-send as a two patch series.
Thanks.
Changes since RFC v2:
- Move device tree veneers into i2c.h as inline functions.
drivers/i2c/i2c-core-acpi.c | 13 +---- drivers/i2c/i2c-core-base.c | 98 +++++++++++++++++++++++++++++++++++++ drivers/i2c/i2c-core-of.c | 66 ------------------------- include/linux/i2c.h | 24 +++++++-- 4 files changed, 120 insertions(+), 81 deletions(-)
drivers/i2c/i2c-core-acpi.c +1 -12
@@ -442,18 +442,7 @@ EXPORT_SYMBOL_GPL(i2c_acpi_find_adapter_by_handle);static struct i2c_client *i2c_acpi_find_client_by_adev (struct acpi_device *adev) { -struct device *dev; -struct i2c_client *client; - - dev =bus_find_device_by_acpi_dev (&i2c_bus_type, adev); -if (!dev) -return NULL ; - - client =i2c_verify_client (dev); -if (!client) -put_device (dev); - -return client; +return i2c_find_device_by_fwnode (acpi_fwnode_handle (adev)); } static int i2c_acpi_notify(struct notifier_block *nb, unsigned long value,
drivers/i2c/i2c-core-base.c +98 -0
110 lines not on this page · raw message
drivers/i2c/i2c-core-of.c +0 -66
72 lines not on this page · raw message
include/linux/i2c.h +21 -3
@@ -964,15 +964,33 @@ int i2c_handle_smbus_host_notify(struct i2c_adapter *adap, unsigned short addr);#endif /* I2C */ +/* must call put_device() when done with returned i2c_client device */ +struct i2c_client *i2c_find_device_by_fwnode (struct fwnode_handle *fwnode); + +/* must call put_device() when done with returned i2c_adapter device */ +struct i2c_adapter *i2c_find_adapter_by_fwnode (struct fwnode_handle *fwnode); + +/* must call i2c_put_adapter() when done with returned i2c_adapter device */ +struct i2c_adapter *i2c_get_adapter_by_fwnode (struct fwnode_handle *fwnode); +#if IS_ENABLED (CONFIG_OF )/* must call put_device() when done with returned i2c_client device */ -struct i2c_client *of_find_i2c_device_by_node (struct device_node *node); +static inline struct i2c_client *of_find_i2c_device_by_node (struct device_node *node) +{ +return i2c_find_device_by_fwnode (of_fwnode_handle (node)); +}/* must call put_device() when done with returned i2c_adapter device */ -struct i2c_adapter *of_find_i2c_adapter_by_node (struct device_node *node); +static inline struct i2c_adapter *of_find_i2c_adapter_by_node (struct device_node *node) +{ +return i2c_find_adapter_by_fwnode (of_fwnode_handle (node)); +}/* must call i2c_put_adapter() when done with returned i2c_adapter device */ -struct i2c_adapter *of_get_i2c_adapter_by_node (struct device_node *node); +static inline struct i2c_adapter *of_get_i2c_adapter_by_node (struct device_node *node) +{ +return i2c_get_adapter_by_fwnode (of_fwnode_handle (node)); +}const struct of_device_id *i2c_of_match_device(const struct of_device_id *matches,
Signature · 1 line
2.30.2