i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING

[~andy/linux] / drivers / i2c / i2c-mux.c

diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 26ab31dd742b76b874ea74035679bd961b58fab6..1038c381aea5bf4542bb574ae308027e607594d9 100644 (file)
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -24,6 +24,8 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
+#include <linux/of.h>
+#include <linux/of_i2c.h>
 
 /* multiplexer per channel data */
 struct i2c_mux_priv {
@@ -125,6 +127,25 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
        priv->adap.algo_data = priv;
        priv->adap.dev.parent = &parent->dev;
 
+       /*
+        * Try to populate the mux adapter's of_node, expands to
+        * nothing if !CONFIG_OF.
+        */
+       if (mux_dev->of_node) {
+               struct device_node *child;
+               u32 reg;
+
+               for_each_child_of_node(mux_dev->of_node, child) {
+                       ret = of_property_read_u32(child, "reg", &reg);
+                       if (ret)
+                               continue;
+                       if (chan_id == reg) {
+                               priv->adap.dev.of_node = child;
+                               break;
+                       }
+               }
+       }
+
        if (force_nr) {
                priv->adap.nr = force_nr;
                ret = i2c_add_numbered_adapter(&priv->adap);
@@ -142,6 +163,8 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
        dev_info(&parent->dev, "Added multiplexed i2c bus %d\n",
                 i2c_adapter_id(&priv->adap));
 
+       of_i2c_register_devices(&priv->adap);
+
        return &priv->adap;
 }
 EXPORT_SYMBOL_GPL(i2c_add_mux_adapter);