Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[pandora-kernel.git] / drivers / i2c / i2c-mux.c

diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index d7a4833..1038c38 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 {
@@ -31,11 +33,11 @@ struct i2c_mux_priv {
        struct i2c_algorithm algo;
 
        struct i2c_adapter *parent;
-       void *mux_dev;  /* the mux chip/device */
+       void *mux_priv; /* the mux chip/device */
        u32  chan_id;   /* the channel id */
 
-       int (*select)(struct i2c_adapter *, void *mux_dev, u32 chan_id);
-       int (*deselect)(struct i2c_adapter *, void *mux_dev, u32 chan_id);
+       int (*select)(struct i2c_adapter *, void *mux_priv, u32 chan_id);
+       int (*deselect)(struct i2c_adapter *, void *mux_priv, u32 chan_id);
 };
 
 static int i2c_mux_master_xfer(struct i2c_adapter *adap,
@@ -47,11 +49,11 @@ static int i2c_mux_master_xfer(struct i2c_adapter *adap,
 
        /* Switch to the right mux port and perform the transfer. */
 
-       ret = priv->select(parent, priv->mux_dev, priv->chan_id);
+       ret = priv->select(parent, priv->mux_priv, priv->chan_id);
        if (ret >= 0)
                ret = parent->algo->master_xfer(parent, msgs, num);
        if (priv->deselect)
-               priv->deselect(parent, priv->mux_dev, priv->chan_id);
+               priv->deselect(parent, priv->mux_priv, priv->chan_id);
 
        return ret;
 }
@@ -67,12 +69,12 @@ static int i2c_mux_smbus_xfer(struct i2c_adapter *adap,
 
        /* Select the right mux port and perform the transfer. */
 
-       ret = priv->select(parent, priv->mux_dev, priv->chan_id);
+       ret = priv->select(parent, priv->mux_priv, priv->chan_id);
        if (ret >= 0)
                ret = parent->algo->smbus_xfer(parent, addr, flags,
                                        read_write, command, size, data);
        if (priv->deselect)
-               priv->deselect(parent, priv->mux_dev, priv->chan_id);
+               priv->deselect(parent, priv->mux_priv, priv->chan_id);
 
        return ret;
 }
@@ -87,7 +89,8 @@ static u32 i2c_mux_functionality(struct i2c_adapter *adap)
 }
 
 struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
-                               void *mux_dev, u32 force_nr, u32 chan_id,
+                               struct device *mux_dev,
+                               void *mux_priv, u32 force_nr, u32 chan_id,
                                int (*select) (struct i2c_adapter *,
                                               void *, u32),
                                int (*deselect) (struct i2c_adapter *,
@@ -102,7 +105,7 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
 
        /* Set up private adapter data */
        priv->parent = parent;
-       priv->mux_dev = mux_dev;
+       priv->mux_priv = mux_priv;
        priv->chan_id = chan_id;
        priv->select = select;
        priv->deselect = deselect;
@@ -124,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);
@@ -141,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);