Skip to content

Commit

Permalink
media: cx231xx: Add second i2c demod client
Browse files Browse the repository at this point in the history
commit 2af0424 upstream

Include ability to add a i2c device style frontend to cx231xx USB
bridge. All current boards set to use frontend[0]. Changes are
backwards compatible with current behaviour.

Signed-off-by: Brad Love <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
b-rad-NDi authored and 6by9 committed Mar 26, 2018
1 parent edcc823 commit d3016c1
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
45 changes: 25 additions & 20 deletions drivers/media/usb/cx231xx/cx231xx-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct cx231xx_dvb {
struct dmx_frontend fe_hw;
struct dmx_frontend fe_mem;
struct dvb_net net;
struct i2c_client *i2c_client_demod;
struct i2c_client *i2c_client_demod[2];
struct i2c_client *i2c_client_tuner;
};

Expand Down Expand Up @@ -616,7 +616,12 @@ static void unregister_dvb(struct cx231xx_dvb *dvb)
i2c_unregister_device(client);
}
/* remove I2C demod */
client = dvb->i2c_client_demod;
client = dvb->i2c_client_demod[1];
if (client) {
module_put(client->dev.driver->owner);
i2c_unregister_device(client);
}
client = dvb->i2c_client_demod[0];
if (client) {
module_put(client->dev.driver->owner);
i2c_unregister_device(client);
Expand Down Expand Up @@ -805,7 +810,7 @@ static int dvb_init(struct cx231xx *dev)
goto out_free;
}

dvb->i2c_client_demod = client;
dvb->i2c_client_demod[0] = client;

dev->dvb->frontend[0]->ops.i2c_gate_ctrl = NULL;

Expand Down Expand Up @@ -852,7 +857,7 @@ static int dvb_init(struct cx231xx *dev)
goto out_free;
}

dvb->i2c_client_demod = client;
dvb->i2c_client_demod[0] = client;

memset(&info, 0, sizeof(struct i2c_board_info));

Expand Down Expand Up @@ -1012,7 +1017,7 @@ static int dvb_init(struct cx231xx *dev)
goto out_free;
}

dvb->i2c_client_demod = client;
dvb->i2c_client_demod[0] = client;

/* attach tuner chip */
si2157_config.fe = dev->dvb->frontend[0];
Expand All @@ -1031,16 +1036,16 @@ static int dvb_init(struct cx231xx *dev)
client = i2c_new_device(tuner_i2c, &info);

if (client == NULL || client->dev.driver == NULL) {
module_put(dvb->i2c_client_demod->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod);
module_put(dvb->i2c_client_demod[0]->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod[0]);
result = -ENODEV;
goto out_free;
}

if (!try_module_get(client->dev.driver->owner)) {
i2c_unregister_device(client);
module_put(dvb->i2c_client_demod->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod);
module_put(dvb->i2c_client_demod[0]->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod[0]);
result = -ENODEV;
goto out_free;
}
Expand Down Expand Up @@ -1078,7 +1083,7 @@ static int dvb_init(struct cx231xx *dev)
goto out_free;
}

dvb->i2c_client_demod = client;
dvb->i2c_client_demod[0] = client;

/* define general-purpose callback pointer */
dvb->frontend[0]->callback = cx231xx_tuner_callback;
Expand Down Expand Up @@ -1122,7 +1127,7 @@ static int dvb_init(struct cx231xx *dev)
goto out_free;
}

dvb->i2c_client_demod = client;
dvb->i2c_client_demod[0] = client;
dev->dvb->frontend[0]->ops.i2c_gate_ctrl = NULL;

/* define general-purpose callback pointer */
Expand All @@ -1144,8 +1149,8 @@ static int dvb_init(struct cx231xx *dev)

client = i2c_new_device(adapter, &info);
if (client == NULL || client->dev.driver == NULL) {
module_put(dvb->i2c_client_demod->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod);
module_put(dvb->i2c_client_demod[0]->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod[0]);
result = -ENODEV;
goto out_free;
}
Expand All @@ -1154,8 +1159,8 @@ static int dvb_init(struct cx231xx *dev)
dev_err(dev->dev,
"Failed to obtain %s tuner.\n", info.type);
i2c_unregister_device(client);
module_put(dvb->i2c_client_demod->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod);
module_put(dvb->i2c_client_demod[0]->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod[0]);
result = -ENODEV;
goto out_free;
}
Expand Down Expand Up @@ -1196,7 +1201,7 @@ static int dvb_init(struct cx231xx *dev)
goto out_free;
}

dvb->i2c_client_demod = client;
dvb->i2c_client_demod[0] = client;
dev->dvb->frontend[0]->ops.i2c_gate_ctrl = NULL;

/* define general-purpose callback pointer */
Expand All @@ -1218,8 +1223,8 @@ static int dvb_init(struct cx231xx *dev)

client = i2c_new_device(tuner_i2c, &info);
if (client == NULL || client->dev.driver == NULL) {
module_put(dvb->i2c_client_demod->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod);
module_put(dvb->i2c_client_demod[0]->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod[0]);
result = -ENODEV;
goto out_free;
}
Expand All @@ -1228,8 +1233,8 @@ static int dvb_init(struct cx231xx *dev)
dev_err(dev->dev,
"Failed to obtain %s tuner.\n", info.type);
i2c_unregister_device(client);
module_put(dvb->i2c_client_demod->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod);
module_put(dvb->i2c_client_demod[0]->dev.driver->owner);
i2c_unregister_device(dvb->i2c_client_demod[0]);
result = -ENODEV;
goto out_free;
}
Expand Down
1 change: 1 addition & 0 deletions drivers/media/usb/cx231xx/cx231xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ struct cx231xx_board {

/* demod related */
int demod_addr;
int demod_addr2;
u8 demod_xfer_mode; /* 0 - Serial; 1 - parallel */

/* GPIO Pins */
Expand Down

0 comments on commit d3016c1

Please sign in to comment.