Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

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

diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 9d37fe6..088799c 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -87,6 +87,13 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
        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:
                /*
                 * The only boards we handle right now.  However other boards
                 * using the CX2388x integrated IR controller should be similar
@@ -139,6 +146,13 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1290:
        case CX23885_BOARD_HAUPPAUGE_HVR1250:
        case CX23885_BOARD_MYGICA_X8507:
+       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:
                /*
                 * The IR controller on this board only returns pulse widths.
                 * Any other mode setting will fail to set up the device.
@@ -305,6 +319,23 @@ int cx23885_input_init(struct cx23885_dev *dev)
                /* A guess at the remote */
                rc_map = RC_MAP_TBS_NEC;
                break;
+       case CX23885_BOARD_DVBSKY_T9580:
+       case CX23885_BOARD_DVBSKY_T980C:
+       case CX23885_BOARD_DVBSKY_S950C:
+       case CX23885_BOARD_DVBSKY_S950:
+       case CX23885_BOARD_DVBSKY_S952:
+       case CX23885_BOARD_DVBSKY_T982:
+               /* Integrated CX23885 IR controller */
+               driver_type = RC_DRIVER_IR_RAW;
+               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;
        }