leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: ngene: adapt cxd2099 attach to the new i2c_client way

Browse Source 
Change the way the cxd2099 hardware is being attached to the new I2C
client interface way.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Jasmin Jessich <jasmin@anw.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Daniel Scheller 2018-02-08 14:53:15 -05:00 committed by Mauro Carvalho Chehab
parent 81a705914b
commit d19e3a72a6
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/media/pci/ngene/ngene-core.c
View File

@ -1562,9 +1562,8 @@ static int init_channels(struct ngene *dev)
return 0;
}
static struct cxd2099_cfg cxd_cfg = {
static const struct cxd2099_cfg cxd_cfgtmpl = {
.bitrate = 62000,
.adr = 0x40,
.polarity = 0,
.clock_mode = 0,
};
@ -1572,18 +1571,52 @@ static struct cxd2099_cfg cxd_cfg = {
static void cxd_attach(struct ngene *dev)
{
struct ngene_ci *ci = &dev->ci;
struct cxd2099_cfg cxd_cfg = cxd_cfgtmpl;
struct i2c_client *client;
struct i2c_board_info board_info = {
.type = "cxd2099",
.addr = 0x40,
.platform_data = &cxd_cfg,
};
cxd_cfg.en = &ci->en;
request_module(board_info.type);
client = i2c_new_device(&dev->channel[0].i2c_adapter, &board_info);
if (!client || !client->dev.driver)
goto err_ret;
if (!try_module_get(client->dev.driver->owner))
goto err_i2c;
if (!ci->en)
goto err_i2c;
ci->en = cxd2099_attach(&cxd_cfg, dev, &dev->channel[0].i2c_adapter);
ci->dev = dev;
dev->channel[0].i2c_client[0] = client;
return;
err_i2c:
i2c_unregister_device(client);
err_ret:
printk(KERN_ERR DEVICE_NAME ": CXD2099AR attach failed\n");
return;
}
static void cxd_detach(struct ngene *dev)
{
struct ngene_ci *ci = &dev->ci;
struct i2c_client *client;
dvb_ca_en50221_release(ci->en);
kfree(ci->en);
client = dev->channel[0].i2c_client[0];
if (client) {
module_put(client->dev.driver->owner);
i2c_unregister_device(client);
}
ci->en = NULL;
}

1
drivers/media/pci/ngene/ngene.h
View File

@ -630,6 +630,7 @@ struct ngene_vopen {
struct ngene_channel {
struct device device;
struct i2c_adapter i2c_adapter;
struct i2c_client *i2c_client[1];
struct ngene *dev;
int number;