Commit 070e6661 authored by nibble.max's avatar nibble.max Committed by Mauro Carvalho Chehab
Browse files

[media] cx23885: add DVBSky S950C and T980C RC support 

DVBSky s950ci dvb-s/s2 ci PCIe card:
1>dvb frontend: M88TS2022(tuner),M88DS3103(demod)
2>ci controller: CIMAX SP2 or its clone.
3>PCIe bridge: CX23885

The patchs are based on the following patchs.
Olli Salonen submit:
https://patchwork.linuxtv.org/patch/26180/
https://patchwork.linuxtv.org/patch/26183/
https://patchwork.linuxtv.org/patch/26324/
Nibble Max submit:
https://patchwork.linuxtv.org/patch/26207/



Signed-off-by: default avatarNibble Max <nibble.max@gmail.com>
Reviewed-by: default avatarOlli Salonen <olli.salonen@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 0e6c7b01

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

+6 −0
Original line number Diff line number Diff line
@@ -1669,6 +1669,8 @@ int cx23885_ir_init(struct cx23885_dev *dev) 
	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:

		if (!enable_885_ir)

			break;

		dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE);
@@ -1716,6 +1718,8 @@ void cx23885_ir_fini(struct cx23885_dev *dev) 
	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:

		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;
@@ -1764,6 +1768,8 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev) 
	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:

		if (dev->sd_ir)

			cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);

		break;

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

+6 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events) 
	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:

		/*

		 * The only boards we handle right now.  However other boards

		 * using the CX2388x integrated IR controller should be similar
@@ -141,6 +143,8 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev) 
	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:

		/*

		 * The IR controller on this board only returns pulse widths.

		 * Any other mode setting will fail to set up the device.
@@ -308,6 +312,8 @@ int cx23885_input_init(struct cx23885_dev *dev) 
		rc_map = RC_MAP_TBS_NEC;

		break;

	case CX23885_BOARD_DVBSKY_T9580:

	case CX23885_BOARD_DVBSKY_T980C:

	case CX23885_BOARD_DVBSKY_S950C:

		/* Integrated CX23885 IR controller */

		driver_type = RC_DRIVER_IR_RAW;

		allowed_protos = RC_BIT_ALL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE