Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a3ecd5f authored by David Daney's avatar David Daney Committed by Wolfram Sang
Browse files

i2c: Add a struct device * parameter to i2c_add_mux_adapter() 



And adjust all callers.

The new device parameter is used in the next patch to initialize the
mux's of_node so that its children may be automatically populated.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Tested-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent d9afca37

drivers/i2c/i2c-mux.c

+10 −9
Original line number Diff line number Diff line
@@ -31,11 +31,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 +47,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 +67,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 +87,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 +103,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;

drivers/i2c/muxes/gpio-i2cmux.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static int __devinit gpiomux_probe(struct platform_device *pdev) 
	for (i = 0; i < pdata->n_values; i++) {

		u32 nr = pdata->base_nr ? (pdata->base_nr + i) : 0;



		mux->adap[i] = i2c_add_mux_adapter(parent, mux, nr, i,

		mux->adap[i] = i2c_add_mux_adapter(parent, &pdev->dev, mux,

						   nr, i,

						   gpiomux_select, deselect);

		if (!mux->adap[i]) {

			ret = -ENODEV;

drivers/i2c/muxes/pca9541.c

+2 −1
Original line number Diff line number Diff line
@@ -353,7 +353,8 @@ static int pca9541_probe(struct i2c_client *client, 
	force = 0;

	if (pdata)

		force = pdata->modes[0].adap_id;

	data->mux_adap = i2c_add_mux_adapter(adap, client, force, 0,

	data->mux_adap = i2c_add_mux_adapter(adap, &client->dev, client,

					     force, 0,

					     pca9541_select_chan,

					     pca9541_release_chan);

drivers/i2c/muxes/pca954x.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int pca954x_probe(struct i2c_client *client, 
		}



		data->virt_adaps[num] =

			i2c_add_mux_adapter(adap, client,

			i2c_add_mux_adapter(adap, &client->dev, client,

				force, num, pca954x_select_chan,

				(pdata && pdata->modes[num].deselect_on_exit)

					? pca954x_deselect_mux : NULL);

include/linux/i2c-mux.h

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
 * mux control.

 */

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 *mux_dev, u32 chan_id),

				int (*deselect) (struct i2c_adapter *,