[media] cx23885: Add IR Rx support for HVR-1270 boards (9b3d8ecc) · Commits · 戴 / test

drivers/media/video/cx23885/cx23885-cards.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -1097,12 +1097,19 @@ int cx23885_ir_init(struct cx23885_dev *dev)
		case CX23885_BOARD_HAUPPAUGE_HVR1800:
		case CX23885_BOARD_HAUPPAUGE_HVR1200:
		case CX23885_BOARD_HAUPPAUGE_HVR1400:
		case CX23885_BOARD_HAUPPAUGE_HVR1270:
		case CX23885_BOARD_HAUPPAUGE_HVR1275:
		case CX23885_BOARD_HAUPPAUGE_HVR1255:
		case CX23885_BOARD_HAUPPAUGE_HVR1210:
		/* FIXME: Implement me */
		break;
		case CX23885_BOARD_HAUPPAUGE_HVR1270:
		ret = cx23888_ir_probe(dev);
		if (ret)
		break;
		dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_888_IR);
		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_HVR1850:
		case CX23885_BOARD_HAUPPAUGE_HVR1290:
		ret = cx23888_ir_probe(dev);
		@@ -1156,6 +1163,7 @@ int cx23885_ir_init(struct cx23885_dev *dev)
		void cx23885_ir_fini(struct cx23885_dev *dev)
		{
		switch (dev->board) {
		case CX23885_BOARD_HAUPPAUGE_HVR1270:
		case CX23885_BOARD_HAUPPAUGE_HVR1850:
		case CX23885_BOARD_HAUPPAUGE_HVR1290:
		cx23885_irq_remove(dev, PCI_MSK_IR);
		@@ -1199,6 +1207,7 @@ int netup_jtag_io(void *device, int tms, int tdi, int read_tdo)
		void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
		{
		switch (dev->board) {
		case CX23885_BOARD_HAUPPAUGE_HVR1270:
		case CX23885_BOARD_HAUPPAUGE_HVR1850:
		case CX23885_BOARD_HAUPPAUGE_HVR1290:
		if (dev->sd_ir)
		@@ -1357,6 +1366,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
		case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
		case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
		case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
		case CX23885_BOARD_HAUPPAUGE_HVR1270:
		case CX23885_BOARD_HAUPPAUGE_HVR1850:
		case CX23885_BOARD_MYGICA_X8506:
		case CX23885_BOARD_MAGICPRO_PROHDTVE2:

drivers/media/video/cx23885/cx23885-input.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
		return;

		switch (dev->board) {
		case CX23885_BOARD_HAUPPAUGE_HVR1270:
		case CX23885_BOARD_HAUPPAUGE_HVR1850:
		case CX23885_BOARD_HAUPPAUGE_HVR1290:
		case CX23885_BOARD_TEVII_S470:
		@@ -133,6 +134,7 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)

		v4l2_subdev_call(dev->sd_ir, ir, rx_g_parameters, &params);
		switch (dev->board) {
		case CX23885_BOARD_HAUPPAUGE_HVR1270:
		case CX23885_BOARD_HAUPPAUGE_HVR1850:
		case CX23885_BOARD_HAUPPAUGE_HVR1290:
		case CX23885_BOARD_HAUPPAUGE_HVR1250:
		@@ -260,6 +262,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
		return -ENODEV;

		switch (dev->board) {
		case CX23885_BOARD_HAUPPAUGE_HVR1270:
		case CX23885_BOARD_HAUPPAUGE_HVR1850:
		case CX23885_BOARD_HAUPPAUGE_HVR1290:
		case CX23885_BOARD_HAUPPAUGE_HVR1250:

Admin message