1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 7875dfbe09ff..8a49e7c9eddd 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -90,6 +90,8 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 /*
                  * The only boards we handle right now.  However other boards
                  * using the CX2388x integrated IR controller should be similar
@@ -168,6 +170,8 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
                 break;
         case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
         case CX23885_BOARD_TEVII_S470:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 /*
                  * The IR controller on this board only returns pulse widths.
                  * Any other mode setting will fail to set up the device.
@@ -298,6 +302,14 @@ int cx23885_input_init(struct cx23885_dev *dev)
                 /* A guess at the remote */
                 rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02;
                 break;
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                /* Integrated CX23885 IR controller */
+                driver_type = RC_DRIVER_IR_RAW;
+                allowed_protos = RC_BIT_ALL;
+                /* A guess at the remote */
+                rc_map = RC_MAP_TBS_NEC;
+                break;
         default:
                 return -ENODEV;
         }