tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] cx23885: Add IR Rx support for HVR-1270 boards

Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Andy Walls and committed by
Mauro Carvalho Chehab 9b3d8ecc de8ae0d5

+14 -1
+11 -1
drivers/media/video/cx23885/cx23885-cards.c
··· 1097 1097 case CX23885_BOARD_HAUPPAUGE_HVR1800: 1098 1098 case CX23885_BOARD_HAUPPAUGE_HVR1200: 1099 1099 case CX23885_BOARD_HAUPPAUGE_HVR1400: 1100 - case CX23885_BOARD_HAUPPAUGE_HVR1270: 1101 1100 case CX23885_BOARD_HAUPPAUGE_HVR1275: 1102 1101 case CX23885_BOARD_HAUPPAUGE_HVR1255: 1103 1102 case CX23885_BOARD_HAUPPAUGE_HVR1210: 1104 1103 /* FIXME: Implement me */ 1104 + break; 1105 + case CX23885_BOARD_HAUPPAUGE_HVR1270: 1106 + ret = cx23888_ir_probe(dev); 1107 + if (ret) 1108 + break; 1109 + dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_888_IR); 1110 + v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config, 1111 + ir_rx_pin_cfg_count, ir_rx_pin_cfg); 1105 1112 break; 1106 1113 case CX23885_BOARD_HAUPPAUGE_HVR1850: 1107 1114 case CX23885_BOARD_HAUPPAUGE_HVR1290: ··· 1163 1156 void cx23885_ir_fini(struct cx23885_dev *dev) 1164 1157 { 1165 1158 switch (dev->board) { 1159 + case CX23885_BOARD_HAUPPAUGE_HVR1270: 1166 1160 case CX23885_BOARD_HAUPPAUGE_HVR1850: 1167 1161 case CX23885_BOARD_HAUPPAUGE_HVR1290: 1168 1162 cx23885_irq_remove(dev, PCI_MSK_IR); ··· 1207 1199 void cx23885_ir_pci_int_enable(struct cx23885_dev *dev) 1208 1200 { 1209 1201 switch (dev->board) { 1202 + case CX23885_BOARD_HAUPPAUGE_HVR1270: 1210 1203 case CX23885_BOARD_HAUPPAUGE_HVR1850: 1211 1204 case CX23885_BOARD_HAUPPAUGE_HVR1290: 1212 1205 if (dev->sd_ir) ··· 1366 1357 case CX23885_BOARD_NETUP_DUAL_DVBS2_CI: 1367 1358 case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: 1368 1359 case CX23885_BOARD_COMPRO_VIDEOMATE_E800: 1360 + case CX23885_BOARD_HAUPPAUGE_HVR1270: 1369 1361 case CX23885_BOARD_HAUPPAUGE_HVR1850: 1370 1362 case CX23885_BOARD_MYGICA_X8506: 1371 1363 case CX23885_BOARD_MAGICPRO_PROHDTVE2:
+3
drivers/media/video/cx23885/cx23885-input.c
··· 82 82 return; 83 83 84 84 switch (dev->board) { 85 + case CX23885_BOARD_HAUPPAUGE_HVR1270: 85 86 case CX23885_BOARD_HAUPPAUGE_HVR1850: 86 87 case CX23885_BOARD_HAUPPAUGE_HVR1290: 87 88 case CX23885_BOARD_TEVII_S470: ··· 134 133 135 134 v4l2_subdev_call(dev->sd_ir, ir, rx_g_parameters, &params); 136 135 switch (dev->board) { 136 + case CX23885_BOARD_HAUPPAUGE_HVR1270: 137 137 case CX23885_BOARD_HAUPPAUGE_HVR1850: 138 138 case CX23885_BOARD_HAUPPAUGE_HVR1290: 139 139 case CX23885_BOARD_HAUPPAUGE_HVR1250: ··· 262 260 return -ENODEV; 263 261 264 262 switch (dev->board) { 263 + case CX23885_BOARD_HAUPPAUGE_HVR1270: 265 264 case CX23885_BOARD_HAUPPAUGE_HVR1850: 266 265 case CX23885_BOARD_HAUPPAUGE_HVR1290: 267 266 case CX23885_BOARD_HAUPPAUGE_HVR1250: