i2c bus extensions were introduced to decouple i2c busses when they are
wired to connectors. Combined with devicetree overlays, they introduce
an additional level of indirection, which is needed to decouple the
overlay (describing the hardware available on addon baord) and the base
tree (describing resources provided to the addon board).
For instance, the following devicetree fragment, available once
overlays are applied, is legit:
i2c1: i2c@abcd0000 {
compatible = "xyz,i2c-ctrl";
i2c-bus-extension@0 {
reg = <0>;
i2c-bus = <&i2c-ctrl>;
};
...
};
connector {
i2c-ctrl {
i2c-parent = <&i2c1>;
#address-cells = <1>;
#size-cells = <0>;
i2c-bus-extension@0 {
reg = <0>;
i2c-bus = <&i2c-other-connector>;
};
device@10 {
compatible = "xyz,foo";
reg = <0x10>;
};
};
devices {
other-connector {
i2c-at-other-connector {
i2c-parent = <&i2c-ctrl>;
#address-cells = <1>;
#size-cells = <0>;
device@20 {
compatible = "xyz,bar";
reg = <0x20>;
};
};
};
};
};
Current implementation of i2c_find_adapter_by_fwnode() supposes that the
fwnode parameter correspond to the adapter.
This assumption is no more valid with i2c bus extensions. Indeed, the
fwnode parameter can reference an i2c bus extension node and not the
related adapter.
In the example, i2c-ctrl and i2c-at-other-connector nodes are chained
bus extensions and those node can be passed to
i2c_find_adapter_by_fwnode() in order to get the related adapter (i.e
the adapter handling the bus and its extensions: i2c@abcd0000).
Extend i2c_find_adapter_by_fwnode() to perform the walking from the
given fwnode through i2c-parent references up to the adapter.
Signed-off-by: Herve Codina <herve.codina@xxxxxxxxxxx>
---
drivers/i2c/i2c-core-base.c | 43 ++++++++++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 5546184df05f..cb7adc5c1285 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -1827,14 +1827,55 @@ static int i2c_dev_or_parent_fwnode_match(struct device *dev, const void *data)
*/
struct i2c_adapter *i2c_find_adapter_by_fwnode(struct fwnode_handle *fwnode)
{
+ struct fwnode_reference_args args;
+ struct fwnode_handle *adap_fwnode;
struct i2c_adapter *adapter;
struct device *dev;
+ int err;
if (!fwnode)
return NULL;
- dev = bus_find_device(&i2c_bus_type, NULL, fwnode,
+ adap_fwnode = fwnode_handle_get(fwnode);
+
+ /* Walk extension busses (through i2c-parent) up to the adapter node */
+ while (fwnode_property_present(adap_fwnode, "i2c-parent")) {
+ /*
+ * A specific case exists for the i2c demux pinctrl. The i2c bus
+ * node related this component (the i2c demux pinctrl node
+ * itself) has an i2c-parent property set. This property is used
+ * by the i2c demux pinctrl component for the demuxing purpose
+ * and is not related to the extension bus feature.
+ *
+ * In this current i2c-parent walking, the i2c demux pinctrl
+ * node has to be considered as an adapter node and so, if
+ * the adap_fwnode node is an i2c demux pinctrl node, simply
+ * stop the i2c-parent walking.
+ */
+ if (fwnode_property_match_string(adap_fwnode, "compatible",
+ "i2c-demux-pinctrl") >= 0)
+ break;
+
+ /*
+ * i2c-parent property available in a i2c bus node means that
+ * this node is an extension bus node. In that case,
+ * continue i2c-parent walking up to the adapter node.
+ */
+ err = fwnode_property_get_reference_args(adap_fwnode, "i2c-parent",
+ NULL, 0, 0, &args);
+ if (err)
+ break;
+
+ pr_debug("Find adapter for %pfw, use parent: %pfw\n", fwnode,
+ args.fwnode);
+
+ fwnode_handle_put(adap_fwnode);
+ adap_fwnode = args.fwnode;
+ }
+
+ dev = bus_find_device(&i2c_bus_type, NULL, adap_fwnode,
i2c_dev_or_parent_fwnode_match);
+ fwnode_handle_put(adap_fwnode);
if (!dev)
return NULL;
--
2.47.1
