Commit 58d7b541 authored by Peter Rosin's avatar Peter Rosin Committed by Wolfram Sang

[media] si2168: convert to use an explicit i2c mux core

Allocate an explicit i2c mux core to handle parent and child adapters
etc. Update the select/deselect ops to be in terms of the i2c mux core
instead of the child adapter.
Tested-by: default avatarAntti Palosaari <crope@iki.fi>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent cddcc40b
...@@ -615,9 +615,9 @@ static int si2168_get_tune_settings(struct dvb_frontend *fe, ...@@ -615,9 +615,9 @@ static int si2168_get_tune_settings(struct dvb_frontend *fe,
* We must use unlocked I2C I/O because I2C adapter lock is already taken * We must use unlocked I2C I/O because I2C adapter lock is already taken
* by the caller (usually tuner driver). * by the caller (usually tuner driver).
*/ */
static int si2168_select(struct i2c_adapter *adap, void *mux_priv, u32 chan) static int si2168_select(struct i2c_mux_core *muxc, u32 chan)
{ {
struct i2c_client *client = mux_priv; struct i2c_client *client = i2c_mux_priv(muxc);
int ret; int ret;
struct si2168_cmd cmd; struct si2168_cmd cmd;
...@@ -635,9 +635,9 @@ static int si2168_select(struct i2c_adapter *adap, void *mux_priv, u32 chan) ...@@ -635,9 +635,9 @@ static int si2168_select(struct i2c_adapter *adap, void *mux_priv, u32 chan)
return ret; return ret;
} }
static int si2168_deselect(struct i2c_adapter *adap, void *mux_priv, u32 chan) static int si2168_deselect(struct i2c_mux_core *muxc, u32 chan)
{ {
struct i2c_client *client = mux_priv; struct i2c_client *client = i2c_mux_priv(muxc);
int ret; int ret;
struct si2168_cmd cmd; struct si2168_cmd cmd;
...@@ -709,17 +709,22 @@ static int si2168_probe(struct i2c_client *client, ...@@ -709,17 +709,22 @@ static int si2168_probe(struct i2c_client *client,
} }
/* create mux i2c adapter for tuner */ /* create mux i2c adapter for tuner */
dev->adapter = i2c_add_mux_adapter(client->adapter, &client->dev, dev->muxc = i2c_mux_alloc(client->adapter, &client->dev,
client, 0, 0, 0, si2168_select, si2168_deselect); 1, 0, 0,
if (dev->adapter == NULL) { si2168_select, si2168_deselect);
ret = -ENODEV; if (!dev->muxc) {
ret = -ENOMEM;
goto err_kfree; goto err_kfree;
} }
dev->muxc->priv = client;
ret = i2c_mux_add_adapter(dev->muxc, 0, 0, 0);
if (ret)
goto err_kfree;
/* create dvb_frontend */ /* create dvb_frontend */
memcpy(&dev->fe.ops, &si2168_ops, sizeof(struct dvb_frontend_ops)); memcpy(&dev->fe.ops, &si2168_ops, sizeof(struct dvb_frontend_ops));
dev->fe.demodulator_priv = client; dev->fe.demodulator_priv = client;
*config->i2c_adapter = dev->adapter; *config->i2c_adapter = dev->muxc->adapter[0];
*config->fe = &dev->fe; *config->fe = &dev->fe;
dev->ts_mode = config->ts_mode; dev->ts_mode = config->ts_mode;
dev->ts_clock_inv = config->ts_clock_inv; dev->ts_clock_inv = config->ts_clock_inv;
...@@ -743,7 +748,7 @@ static int si2168_remove(struct i2c_client *client) ...@@ -743,7 +748,7 @@ static int si2168_remove(struct i2c_client *client)
dev_dbg(&client->dev, "\n"); dev_dbg(&client->dev, "\n");
i2c_del_mux_adapter(dev->adapter); i2c_mux_del_adapters(dev->muxc);
dev->fe.ops.release = NULL; dev->fe.ops.release = NULL;
dev->fe.demodulator_priv = NULL; dev->fe.demodulator_priv = NULL;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
/* state struct */ /* state struct */
struct si2168_dev { struct si2168_dev {
struct i2c_adapter *adapter; struct i2c_mux_core *muxc;
struct dvb_frontend fe; struct dvb_frontend fe;
enum fe_delivery_system delivery_system; enum fe_delivery_system delivery_system;
enum fe_status fe_status; enum fe_status fe_status;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment