1 files changed, 107 insertions, 7 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 2014daedee8b..e76ce8709afd 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -30,6 +30,16 @@
 #include "netup-init.h"
 #include "cx23888-ir.h"
 
+static unsigned int enable_885_ir;
+module_param(enable_885_ir, int, 0644);
+MODULE_PARM_DESC(enable_885_ir,
+                 "Enable integrated IR controller for supported\n"
+                 "\t\t    CX2388[57] boards that are wired for it:\n"
+                 "\t\t\tHVR-1250 (reported safe)\n"
+                 "\t\t\tTeVii S470 (reported unsafe)\n"
+                 "\t\t    This can cause an interrupt storm with some cards.\n"
+                 "\t\t    Default: 0 [Disabled]");
+
 /* ------------------------------------------------------------------ */
 /* board config info                                                  */
 
@@ -626,6 +636,9 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
         case 79101:
                 /* WinTV-HVR1250 (PCIe, Retail, IR, half height,
                         ATSC and Basic analog */
+        case 79501:
+                /* WinTV-HVR1250 (PCIe, No IR, half height,
+                        ATSC [at least] and Basic analog) */
         case 79561:
                 /* WinTV-HVR1250 (PCIe, OEM, No IR, half height,
                         ATSC and Basic analog */
@@ -959,9 +972,37 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
 
 int cx23885_ir_init(struct cx23885_dev *dev)
 {
+        static struct v4l2_subdev_io_pin_config ir_rxtx_pin_cfg[] = {
+                {
+                        .flags    = V4L2_SUBDEV_IO_PIN_INPUT,
+                        .pin      = CX23885_PIN_IR_RX_GPIO19,
+                        .function = CX23885_PAD_IR_RX,
+                        .value    = 0,
+                        .strength = CX25840_PIN_DRIVE_MEDIUM,
+                }, {
+                        .flags    = V4L2_SUBDEV_IO_PIN_OUTPUT,
+                        .pin      = CX23885_PIN_IR_TX_GPIO20,
+                        .function = CX23885_PAD_IR_TX,
+                        .value    = 0,
+                        .strength = CX25840_PIN_DRIVE_MEDIUM,
+                }
+        };
+        const size_t ir_rxtx_pin_cfg_count = ARRAY_SIZE(ir_rxtx_pin_cfg);
+
+        static struct v4l2_subdev_io_pin_config ir_rx_pin_cfg[] = {
+                {
+                        .flags    = V4L2_SUBDEV_IO_PIN_INPUT,
+                        .pin      = CX23885_PIN_IR_RX_GPIO19,
+                        .function = CX23885_PAD_IR_RX,
+                        .value    = 0,
+                        .strength = CX25840_PIN_DRIVE_MEDIUM,
+                }
+        };
+        const size_t ir_rx_pin_cfg_count = ARRAY_SIZE(ir_rx_pin_cfg);
+
+        struct v4l2_subdev_ir_parameters params;
         int ret = 0;
         switch (dev->board) {
-        case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
@@ -979,7 +1020,41 @@ int cx23885_ir_init(struct cx23885_dev *dev)
                 if (ret)
                         break;
                 dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_888_IR);
-                dev->pci_irqmask |= PCI_MSK_IR;
+                v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config,
+                                 ir_rxtx_pin_cfg_count, ir_rxtx_pin_cfg);
+                /*
+                 * For these boards we need to invert the Tx output via the
+                 * IR controller to have the LED off while idle
+                 */
+                v4l2_subdev_call(dev->sd_ir, ir, tx_g_parameters, &params);
+                params.enable = false;
+                params.shutdown = false;
+                params.invert_level = true;
+                v4l2_subdev_call(dev->sd_ir, ir, tx_s_parameters, &params);
+                params.shutdown = true;
+                v4l2_subdev_call(dev->sd_ir, ir, tx_s_parameters, &params);
+                break;
+        case CX23885_BOARD_TEVII_S470:
+                if (!enable_885_ir)
+                        break;
+                dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE);
+                if (dev->sd_ir == NULL) {
+                        ret = -ENODEV;
+                        break;
+                }
+                v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config,
+                                 ir_rx_pin_cfg_count, ir_rx_pin_cfg);
+                break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1250:
+                if (!enable_885_ir)
+                        break;
+                dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE);
+                if (dev->sd_ir == NULL) {
+                        ret = -ENODEV;
+                        break;
+                }
+                v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config,
+                                 ir_rxtx_pin_cfg_count, ir_rxtx_pin_cfg);
                 break;
         case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
                 request_module("ir-kbd-i2c");
@@ -994,11 +1069,16 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
         switch (dev->board) {
         case CX23885_BOARD_HAUPPAUGE_HVR1850:
         case CX23885_BOARD_HAUPPAUGE_HVR1290:
-                dev->pci_irqmask &= ~PCI_MSK_IR;
-                cx_clear(PCI_INT_MSK, PCI_MSK_IR);
+                cx23885_irq_remove(dev, PCI_MSK_IR);
                 cx23888_ir_remove(dev);
                 dev->sd_ir = NULL;
                 break;
+        case CX23885_BOARD_TEVII_S470:
+        case CX23885_BOARD_HAUPPAUGE_HVR1250:
+                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;
+                break;
         }
 }
 
@@ -1007,8 +1087,13 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
         switch (dev->board) {
         case CX23885_BOARD_HAUPPAUGE_HVR1850:
         case CX23885_BOARD_HAUPPAUGE_HVR1290:
-                if (dev->sd_ir && (dev->pci_irqmask & PCI_MSK_IR))
-                        cx_set(PCI_INT_MSK, PCI_MSK_IR);
+                if (dev->sd_ir)
+                        cx23885_irq_add_enable(dev, PCI_MSK_IR);
+                break;
+        case CX23885_BOARD_TEVII_S470:
+        case CX23885_BOARD_HAUPPAUGE_HVR1250:
+                if (dev->sd_ir)
+                        cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);
                 break;
         }
 }
@@ -1028,6 +1113,13 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 
         switch (dev->board) {
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
+                if (dev->i2c_bus[0].i2c_rc == 0) {
+                        if (eeprom[0x80] != 0x84)
+                                hauppauge_eeprom(dev, eeprom+0xc0);
+                        else
+                                hauppauge_eeprom(dev, eeprom+0x80);
+                }
+                break;
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
@@ -1136,6 +1228,11 @@ void cx23885_card_setup(struct cx23885_dev *dev)
          * loaded, ensure this happens.
          */
         switch (dev->board) {
+        case CX23885_BOARD_TEVII_S470:
+        case CX23885_BOARD_HAUPPAUGE_HVR1250:
+                /* Currently only enabled for the integrated IR controller */
+                if (!enable_885_ir)
+                        break;
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
@@ -1151,7 +1248,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[2].i2c_adap,
                                 "cx25840", "cx25840", 0x88 >> 1, NULL);
-                v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
+                if (dev->sd_cx25840) {
+                        dev->sd_cx25840->grp_id = CX23885_HW_AV_CORE;
+                        v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
+                }
                 break;
         }