[media] cx23885: add support for TechnoTrend CT2-4500 CI

TechnoTrend CT2-4500 CI is a PCIe device with DVB-T2/C tuner. It is
similar to DVBSky T980C, just with different PCI ID and remote controller.

Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index d9ba48cfb41f84aa9a26033d054326e3a8b9032a..9c7e8ac31cce9e873bd5e85f97387616c2252400 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -688,6 +688,10 @@ struct cx23885_board cx23885_boards[] = {
                .name           = "DVBSky S950C",
                .portb          = CX23885_MPEG_DVB,
        },
+       [CX23885_BOARD_TT_CT2_4500_CI] = {
+               .name           = "Technotrend TT-budget CT2-4500 CI",
+               .portb          = CX23885_MPEG_DVB,
+       },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -955,6 +959,10 @@ struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x4254,
                .subdevice = 0x950c,
                .card      = CX23885_BOARD_DVBSKY_S950C,
+       }, {
+               .subvendor = 0x13c2,
+               .subdevice = 0x3013,
+               .card      = CX23885_BOARD_TT_CT2_4500_CI,
        },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -1559,6 +1567,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                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
@@ -1671,6 +1680,7 @@ int cx23885_ir_init(struct cx23885_dev *dev)
        case CX23885_BOARD_DVBSKY_T9580:
        case CX23885_BOARD_DVBSKY_T980C:
        case CX23885_BOARD_DVBSKY_S950C:
+       case CX23885_BOARD_TT_CT2_4500_CI:
                if (!enable_885_ir)
                        break;
                dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE);
@@ -1720,6 +1730,7 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
        case CX23885_BOARD_DVBSKY_T9580:
        case CX23885_BOARD_DVBSKY_T980C:
        case CX23885_BOARD_DVBSKY_S950C:
+       case CX23885_BOARD_TT_CT2_4500_CI:
                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;
@@ -1770,6 +1781,7 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
        case CX23885_BOARD_DVBSKY_T9580:
        case CX23885_BOARD_DVBSKY_T980C:
        case CX23885_BOARD_DVBSKY_S950C:
+       case CX23885_BOARD_TT_CT2_4500_CI:
                if (dev->sd_ir)
                        cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);
                break;
@@ -1875,6 +1887,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_PROF_8000:
        case CX23885_BOARD_DVBSKY_T980C:
        case CX23885_BOARD_DVBSKY_S950C:
+       case CX23885_BOARD_TT_CT2_4500_CI:
                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;
@@ -1995,6 +2008,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_DVBSKY_T9580:
        case CX23885_BOARD_DVBSKY_T980C:
        case CX23885_BOARD_DVBSKY_S950C:
+       case CX23885_BOARD_TT_CT2_4500_CI:
                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_bus[2].i2c_adap,
                                "cx25840", 0x88 >> 1, NULL);

diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index f82eb1881ac2271d5ae25b0753e274c6a6c8408d..5e6caed6e389de7de6d8620dd27c8100a1de3b9b 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -1766,6 +1766,7 @@ static int dvb_register(struct cx23885_tsport *port)
                }
                break;
        case CX23885_BOARD_DVBSKY_T980C:
+       case CX23885_BOARD_TT_CT2_4500_CI:
                i2c_bus = &dev->i2c_bus[1];
                i2c_bus2 = &dev->i2c_bus[0];
 
@@ -1938,7 +1939,8 @@ static int dvb_register(struct cx23885_tsport *port)
                break;
                }
        case CX23885_BOARD_DVBSKY_S950C:
-       case CX23885_BOARD_DVBSKY_T980C: {
+       case CX23885_BOARD_DVBSKY_T980C:
+       case CX23885_BOARD_TT_CT2_4500_CI: {
                u8 eeprom[256]; /* 24C02 i2c eeprom */
 
                /* attach CI */
@@ -1985,8 +1987,8 @@ 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/S950C MAC address: %pM\n",
-                       eeprom + 0xc0);
+               printk(KERN_INFO "%s MAC address: %pM\n",
+                       cx23885_boards[dev->board].name, eeprom + 0xc0);
                memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xc0, 6);
                break;
                }

diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 0bf6839cb04dae2a2f92d31862bcdc503fae3a22..12d8a3de7df469a10671ddcb1b6f30192c7403d6 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -90,6 +90,7 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
        case CX23885_BOARD_DVBSKY_T9580:
        case CX23885_BOARD_DVBSKY_T980C:
        case CX23885_BOARD_DVBSKY_S950C:
+       case CX23885_BOARD_TT_CT2_4500_CI:
                /*
                 * The only boards we handle right now.  However other boards
                 * using the CX2388x integrated IR controller should be similar
@@ -145,6 +146,7 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
        case CX23885_BOARD_DVBSKY_T9580:
        case CX23885_BOARD_DVBSKY_T980C:
        case CX23885_BOARD_DVBSKY_S950C:
+       case CX23885_BOARD_TT_CT2_4500_CI:
                /*
                 * The IR controller on this board only returns pulse widths.
                 * Any other mode setting will fail to set up the device.
@@ -319,6 +321,12 @@ int cx23885_input_init(struct cx23885_dev *dev)
                allowed_protos = RC_BIT_ALL;
                rc_map = RC_MAP_DVBSKY;
                break;
+       case CX23885_BOARD_TT_CT2_4500_CI:
+               /* Integrated CX23885 IR controller */
+               driver_type = RC_DRIVER_IR_RAW;
+               allowed_protos = RC_BIT_ALL;
+               rc_map = RC_MAP_TT_1500;
+               break;
        default:
                return -ENODEV;
        }

diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index f6f6974ee824ce16d14fcb37ed5b43982f3ec20c..7eee2ea18eded00161d99ae342aa0417e0fb2e5c 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -95,6 +95,7 @@
 #define CX23885_BOARD_DVBSKY_T9580             45
 #define CX23885_BOARD_DVBSKY_T980C             46
 #define CX23885_BOARD_DVBSKY_S950C             47
+#define CX23885_BOARD_TT_CT2_4500_CI           48
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002