1 files changed, 131 insertions, 0 deletions

diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 88c257d1161b..db99ca2613ba 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -680,6 +680,32 @@ struct cx23885_board cx23885_boards[] = {
                 .portb          = CX23885_MPEG_DVB,
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_DVBSKY_T980C] = {
+                .name           = "DVBSky T980C",
+                .portb          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_DVBSKY_S950C] = {
+                .name           = "DVBSky S950C",
+                .portb          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_TT_CT2_4500_CI] = {
+                .name           = "Technotrend TT-budget CT2-4500 CI",
+                .portb          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_DVBSKY_S950] = {
+                .name           = "DVBSky S950",
+                .portb          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_DVBSKY_S952] = {
+                .name           = "DVBSky S952",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_DVBSKY_T982] = {
+                .name           = "DVBSky T982",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -939,6 +965,30 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x4254,
                 .subdevice = 0x9580,
                 .card      = CX23885_BOARD_DVBSKY_T9580,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x980c,
+                .card      = CX23885_BOARD_DVBSKY_T980C,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x950c,
+                .card      = CX23885_BOARD_DVBSKY_S950C,
+        }, {
+                .subvendor = 0x13c2,
+                .subdevice = 0x3013,
+                .card      = CX23885_BOARD_TT_CT2_4500_CI,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x0950,
+                .card      = CX23885_BOARD_DVBSKY_S950,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x0952,
+                .card      = CX23885_BOARD_DVBSKY_S952,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x0982,
+                .card      = CX23885_BOARD_DVBSKY_T982,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -1534,6 +1584,8 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(60);
                 break;
         case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 /* enable GPIO3-18 pins */
                 cx_write(MC417_CTL, 0x00000037);
                 cx23885_gpio_enable(dev, GPIO_2 | GPIO_11, 1);
@@ -1541,6 +1593,45 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(100);
                 cx23885_gpio_set(dev, GPIO_2 | GPIO_11);
                 break;
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+                /*
+                 * GPIO-0 INTA from CiMax, input
+                 * GPIO-1 reset CiMax, output, high active
+                 * GPIO-2 reset demod, output, low active
+                 * GPIO-3 to GPIO-10 data/addr for CAM
+                 * GPIO-11 ~CS0 to CiMax1
+                 * GPIO-12 ~CS1 to CiMax2
+                 * GPIO-13 ADL0 load LSB addr
+                 * GPIO-14 ADL1 load MSB addr
+                 * GPIO-15 ~RDY from CiMax
+                 * GPIO-17 ~RD to CiMax
+                 * GPIO-18 ~WR to CiMax
+                 */
+
+                cx_set(GP0_IO, 0x00060002); /* GPIO 1/2 as output */
+                cx_clear(GP0_IO, 0x00010004); /* GPIO 0 as input */
+                mdelay(100); /* reset delay */
+                cx_set(GP0_IO, 0x00060004); /* GPIO as out, reset high */
+                cx_clear(GP0_IO, 0x00010002);
+                cx_write(MC417_CTL, 0x00000037); /* enable GPIO3-18 pins */
+
+                /* GPIO-15 IN as ~ACK, rest as OUT */
+                cx_write(MC417_OEN, 0x00001000);
+
+                /* ~RD, ~WR high; ADL0, ADL1 low; ~CS0, ~CS1 high */
+                cx_write(MC417_RWD, 0x0000c300);
+
+                /* enable irq */
+                cx_write(GPIO_ISM, 0x00000000); /* INTERRUPTS active low */
+                break;
+        case CX23885_BOARD_DVBSKY_S950:
+                cx23885_gpio_enable(dev, GPIO_2, 1);
+                cx23885_gpio_clear(dev, GPIO_2);
+                msleep(100);
+                cx23885_gpio_set(dev, GPIO_2);
+                break;
         }
 }
 
@@ -1621,6 +1712,13 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 if (!enable_885_ir)
                         break;
                 dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE);
@@ -1667,6 +1765,13 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 cx23885_irq_remove(dev, PCI_MSK_AV_CORE);
                 /* sd_ir is a duplicate pointer to the AV Core, just clear it */
                 dev->sd_ir = NULL;
@@ -1714,6 +1819,13 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 if (dev->sd_ir)
                         cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);
                 break;
@@ -1817,6 +1929,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_TEVII_S471:
         case CX23885_BOARD_DVBWORLD_2005:
         case CX23885_BOARD_PROF_8000:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
                 ts1->gen_ctrl_val  = 0x5; /* Parallel */
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
@@ -1865,6 +1981,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
         case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T982:
                 ts1->gen_ctrl_val  = 0x5; /* Parallel */
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
@@ -1872,6 +1989,14 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
+        case CX23885_BOARD_DVBSKY_S952:
+                ts1->gen_ctrl_val  = 0x5; /* Parallel */
+                ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                ts2->gen_ctrl_val  = 0xe; /* Serial bus */
+                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                break;
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
@@ -1935,6 +2060,12 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
         case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[2].i2c_adap,
                                 "cx25840", 0x88 >> 1, NULL);