[media] cx23885: add I2C client for CI into state and handle unregistering

[cascardo/linux.git] / drivers / media / pci / cx23885 / cx23885-dvb.c

diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 13734b8..5ea1027 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -1600,6 +1600,7 @@ static int dvb_register(struct cx23885_tsport *port)
                                break;
 
                        /* attach tuner */
+                       memset(&m88ts2022_config, 0, sizeof(m88ts2022_config));
                        m88ts2022_config.fe = fe0->dvb.frontend;
                        m88ts2022_config.clock = 27000000;
                        memset(&info, 0, sizeof(struct i2c_board_info));
@@ -1635,6 +1636,7 @@ static int dvb_register(struct cx23885_tsport *port)
                /* port c - terrestrial/cable */
                case 2:
                        /* attach frontend */
+                       memset(&si2168_config, 0, sizeof(si2168_config));
                        si2168_config.i2c_adapter = &adapter;
                        si2168_config.fe = &fe0->dvb.frontend;
                        si2168_config.ts_mode = SI2168_TS_SERIAL;
@@ -1654,6 +1656,7 @@ static int dvb_register(struct cx23885_tsport *port)
                        port->i2c_client_demod = client_demod;
 
                        /* attach tuner */
+                       memset(&si2157_config, 0, sizeof(si2157_config));
                        si2157_config.fe = fe0->dvb.frontend;
                        memset(&info, 0, sizeof(struct i2c_board_info));
                        strlcpy(info.type, "si2157", I2C_NAME_SIZE);
@@ -1677,6 +1680,52 @@ static int dvb_register(struct cx23885_tsport *port)
                        break;
                }
                break;
+       case CX23885_BOARD_DVBSKY_T980C:
+               i2c_bus = &dev->i2c_bus[1];
+
+               /* attach frontend */
+               memset(&si2168_config, 0, sizeof(si2168_config));
+               si2168_config.i2c_adapter = &adapter;
+               si2168_config.fe = &fe0->dvb.frontend;
+               si2168_config.ts_mode = SI2168_TS_PARALLEL;
+               memset(&info, 0, sizeof(struct i2c_board_info));
+               strlcpy(info.type, "si2168", I2C_NAME_SIZE);
+               info.addr = 0x64;
+               info.platform_data = &si2168_config;
+               request_module(info.type);
+               client_demod = i2c_new_device(&i2c_bus->i2c_adap, &info);
+               if (client_demod == NULL ||
+                               client_demod->dev.driver == NULL)
+                       goto frontend_detach;
+               if (!try_module_get(client_demod->dev.driver->owner)) {
+                       i2c_unregister_device(client_demod);
+                       goto frontend_detach;
+               }
+               port->i2c_client_demod = client_demod;
+
+               /* attach tuner */
+               memset(&si2157_config, 0, sizeof(si2157_config));
+               si2157_config.fe = fe0->dvb.frontend;
+               memset(&info, 0, sizeof(struct i2c_board_info));
+               strlcpy(info.type, "si2157", I2C_NAME_SIZE);
+               info.addr = 0x60;
+               info.platform_data = &si2157_config;
+               request_module(info.type);
+               client_tuner = i2c_new_device(adapter, &info);
+               if (client_tuner == NULL ||
+                               client_tuner->dev.driver == NULL) {
+                       module_put(client_demod->dev.driver->owner);
+                       i2c_unregister_device(client_demod);
+                       goto frontend_detach;
+               }
+               if (!try_module_get(client_tuner->dev.driver->owner)) {
+                       i2c_unregister_device(client_tuner);
+                       module_put(client_demod->dev.driver->owner);
+                       i2c_unregister_device(client_demod);
+                       goto frontend_detach;
+               }
+               port->i2c_client_tuner = client_tuner;
+               break;
        default:
                printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
                        " isn't supported yet\n",
@@ -1767,6 +1816,21 @@ static int dvb_register(struct cx23885_tsport *port)
                        (port->nr-1) * 8, 6);
                break;
                }
+       case CX23885_BOARD_DVBSKY_T980C: {
+               u8 eeprom[256]; /* 24C02 i2c eeprom */
+
+               if (port->nr != 1)
+                       break;
+
+               /* Read entire EEPROM */
+               dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
+               tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom,
+                               sizeof(eeprom));
+               printk(KERN_INFO "DVBSky T980C MAC address: %pM\n",
+                       eeprom + 0xc0);
+               memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xc0, 6);
+               break;
+               }
        }
 
        return ret;
@@ -1850,6 +1914,13 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port)
        struct vb2_dvb_frontend *fe0;
        struct i2c_client *client;
 
+       /* remove I2C client for CI */
+       client = port->i2c_client_ci;
+       if (client) {
+               module_put(client->dev.driver->owner);
+               i2c_unregister_device(client);
+       }
+
        /* remove I2C client for tuner */
        client = port->i2c_client_tuner;
        if (client) {