1 files changed, 68 insertions, 11 deletions

diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 757854914781..f82eb1881ac2 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -635,7 +635,7 @@ static int cx23885_sp2_ci_ctrl(void *priv, u8 read, int addr,
         struct cx23885_tsport *port = priv;
         struct cx23885_dev *dev = port->dev;
         int ret;
-        int tmp;
+        int tmp = 0;
         unsigned long timeout;
 
         mutex_lock(&dev->gpio_lock);
@@ -865,6 +865,19 @@ static const struct m88ds3103_config dvbsky_t9580_m88ds3103_config = {
         .agc = 0x99,
 };
 
+static const struct m88ds3103_config dvbsky_s950c_m88ds3103_config = {
+        .i2c_addr = 0x68,
+        .clock = 27000000,
+        .i2c_wr_max = 33,
+        .clock_out = 0,
+        .ts_mode = M88DS3103_TS_CI,
+        .ts_clk = 10000,
+        .ts_clk_pol = 1,
+        .lnb_en_pol = 1,
+        .lnb_hv_pol = 0,
+        .agc = 0x99,
+};
+
 static int netup_altera_fpga_rw(void *device, int flag, int data, int read)
 {
         struct cx23885_dev *dev = (struct cx23885_dev *)device;
@@ -1020,7 +1033,7 @@ static int dvb_register(struct cx23885_tsport *port)
         struct m88ts2022_config m88ts2022_config;
         struct i2c_board_info info;
         struct i2c_adapter *adapter;
-        struct i2c_client *client_demod, *client_tuner, *client_ci;
+        struct i2c_client *client_demod = NULL, *client_tuner = NULL, *client_ci = NULL;
         int mfe_shared = 0; /* bus not shared by default */
         int ret;
 
@@ -1799,6 +1812,41 @@ static int dvb_register(struct cx23885_tsport *port)
                 }
                 port->i2c_client_tuner = client_tuner;
                 break;
+        case CX23885_BOARD_DVBSKY_S950C:
+                i2c_bus = &dev->i2c_bus[1];
+                i2c_bus2 = &dev->i2c_bus[0];
+
+                /* attach frontend */
+                fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
+                                &dvbsky_s950c_m88ds3103_config,
+                                &i2c_bus->i2c_adap, &adapter);
+                if (fe0->dvb.frontend == NULL)
+                        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));
+                strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE);
+                info.addr = 0x60;
+                info.platform_data = &m88ts2022_config;
+                request_module(info.type);
+                client_tuner = i2c_new_device(adapter, &info);
+                if (client_tuner == NULL ||
+                                client_tuner->dev.driver == NULL)
+                        goto frontend_detach;
+                if (!try_module_get(client_tuner->dev.driver->owner)) {
+                        i2c_unregister_device(client_tuner);
+                        goto frontend_detach;
+                }
+
+                /* delegate signal strength measurement to tuner */
+                fe0->dvb.frontend->ops.read_signal_strength =
+                        fe0->dvb.frontend->ops.tuner_ops.get_rf_strength;
+
+                port->i2c_client_tuner = client_tuner;
+                break;
         default:
                 printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
                         " isn't supported yet\n",
@@ -1889,6 +1937,7 @@ static int dvb_register(struct cx23885_tsport *port)
                         (port->nr-1) * 8, 6);
                 break;
                 }
+        case CX23885_BOARD_DVBSKY_S950C:
         case CX23885_BOARD_DVBSKY_T980C: {
                 u8 eeprom[256]; /* 24C02 i2c eeprom */
 
@@ -1905,18 +1954,26 @@ static int dvb_register(struct cx23885_tsport *port)
                 client_ci = i2c_new_device(&i2c_bus2->i2c_adap, &info);
                 if (client_ci == NULL ||
                                 client_ci->dev.driver == NULL) {
-                        module_put(client_tuner->dev.driver->owner);
-                        i2c_unregister_device(client_tuner);
-                        module_put(client_demod->dev.driver->owner);
-                        i2c_unregister_device(client_demod);
+                        if (client_tuner) {
+                                module_put(client_tuner->dev.driver->owner);
+                                i2c_unregister_device(client_tuner);
+                        }
+                        if (client_demod) {
+                                module_put(client_demod->dev.driver->owner);
+                                i2c_unregister_device(client_demod);
+                        }
                         goto frontend_detach;
                 }
                 if (!try_module_get(client_ci->dev.driver->owner)) {
                         i2c_unregister_device(client_ci);
-                        module_put(client_tuner->dev.driver->owner);
-                        i2c_unregister_device(client_tuner);
-                        module_put(client_demod->dev.driver->owner);
-                        i2c_unregister_device(client_demod);
+                        if (client_tuner) {
+                                module_put(client_tuner->dev.driver->owner);
+                                i2c_unregister_device(client_tuner);
+                        }
+                        if (client_demod) {
+                                module_put(client_demod->dev.driver->owner);
+                                i2c_unregister_device(client_demod);
+                        }
                         goto frontend_detach;
                 }
                 port->i2c_client_ci = client_ci;
@@ -1928,7 +1985,7 @@ static int dvb_register(struct cx23885_tsport *port)
                 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",
+                printk(KERN_INFO "DVBSky T980C/S950C MAC address: %pM\n",
                         eeprom + 0xc0);
                 memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xc0, 6);
                 break;