media: cx231xx: Add second i2c demod client

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 <brad@nextdimension.cc>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index e81f2a4c81e9980dfcabb6123ca9d28130ab76e7..63deca9b5017cdfb2e463e9d82e92eb47f0ef3cf 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -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;
 };
 
@@ -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);
@@ -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;
 
@@ -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));
 
@@ -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];
@@ -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;
                }
@@ -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;
@@ -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 */
@@ -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;
                }
@@ -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;
                }
@@ -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 */
@@ -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;
                }
@@ -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;
                }

diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index fa993f76bf5940ac400a600cbee8c11470c1341f..6ffa4bd96484ec520cb3af0b54b2f41b44d94d1f 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -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 */