Commit de8ae0d5 authored by Peter Moon's avatar Peter Moon Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx: Add support for Hauppauge WinTV USB2-FM 



This patch adds support for the "Hauppauge WinTV USB2-FM" Analog TV Stick.
It includes support for both the PAL and NTSC variants of the device.

Signed-off-by: default avatarPeter Moon <pomoon@gmail.com>
Reviewed-by: default avatarDevin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c3f305aa

drivers/media/video/cx231xx/cx231xx-avcore.c

+4 −0
Original line number Diff line number Diff line
@@ -355,6 +355,8 @@ int cx231xx_afe_update_power_control(struct cx231xx *dev, 
	case CX231XX_BOARD_HAUPPAUGE_EXETER:

	case CX231XX_BOARD_HAUPPAUGE_USBLIVE2:

	case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:

	case CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL:

	case CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC:

		if (avmode == POLARIS_AVMODE_ANALOGT_TV) {

			while (afe_power_status != (FLD_PWRDN_TUNING_BIAS |

						FLD_PWRDN_ENABLE_PLL)) {
@@ -1733,6 +1735,8 @@ int cx231xx_dif_set_standard(struct cx231xx *dev, u32 standard) 
		break;

	case CX231XX_BOARD_CNXT_RDE_253S:

	case CX231XX_BOARD_CNXT_RDU_253S:

	case CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL:

	case CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC:

		func_mode = 0x01;

		break;

	default:

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

+74 −0
Original line number Diff line number Diff line
@@ -532,6 +532,76 @@ struct cx231xx_board cx231xx_boards[] = { 
			.gpio = NULL,

		} },

	},

	[CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL] = {

		.name = "Hauppauge WinTV USB2 FM (PAL)",

		.tuner_type = TUNER_NXP_TDA18271,

		.tuner_addr = 0x60,

		.tuner_gpio = RDE250_XCV_TUNER,

		.tuner_sif_gpio = 0x05,

		.tuner_scl_gpio = 0x1a,

		.tuner_sda_gpio = 0x1b,

		.decoder = CX231XX_AVDECODER,

		.output_mode = OUT_MODE_VIP11,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = 1,

		.norm = V4L2_STD_PAL,



		.input = {{

			.type = CX231XX_VMUX_TELEVISION,

			.vmux = CX231XX_VIN_3_1,

			.amux = CX231XX_AMUX_VIDEO,

			.gpio = NULL,

		}, {

			.type = CX231XX_VMUX_COMPOSITE1,

			.vmux = CX231XX_VIN_2_1,

			.amux = CX231XX_AMUX_LINE_IN,

			.gpio = NULL,

		}, {

			.type = CX231XX_VMUX_SVIDEO,

			.vmux = CX231XX_VIN_1_1 |

				(CX231XX_VIN_1_2 << 8) |

				CX25840_SVIDEO_ON,

			.amux = CX231XX_AMUX_LINE_IN,

			.gpio = NULL,

		} },

	},

	[CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC] = {

		.name = "Hauppauge WinTV USB2 FM (NTSC)",

		.tuner_type = TUNER_NXP_TDA18271,

		.tuner_addr = 0x60,

		.tuner_gpio = RDE250_XCV_TUNER,

		.tuner_sif_gpio = 0x05,

		.tuner_scl_gpio = 0x1a,

		.tuner_sda_gpio = 0x1b,

		.decoder = CX231XX_AVDECODER,

		.output_mode = OUT_MODE_VIP11,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = 1,

		.norm = V4L2_STD_NTSC,



		.input = {{

			.type = CX231XX_VMUX_TELEVISION,

			.vmux = CX231XX_VIN_3_1,

			.amux = CX231XX_AMUX_VIDEO,

			.gpio = NULL,

		}, {

			.type = CX231XX_VMUX_COMPOSITE1,

			.vmux = CX231XX_VIN_2_1,

			.amux = CX231XX_AMUX_LINE_IN,

			.gpio = NULL,

		}, {

			.type = CX231XX_VMUX_SVIDEO,

			.vmux = CX231XX_VIN_1_1 |

				(CX231XX_VIN_1_2 << 8) |

				CX25840_SVIDEO_ON,

			.amux = CX231XX_AMUX_LINE_IN,

			.gpio = NULL,

		} },

	},

};

const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
@@ -553,6 +623,10 @@ struct usb_device_id cx231xx_id_table[] = { 
	 .driver_info = CX231XX_BOARD_CNXT_RDE_250},

	{USB_DEVICE(0x0572, 0x58A0),

	 .driver_info = CX231XX_BOARD_CNXT_RDU_250},

	{USB_DEVICE(0x2040, 0xb110),

	 .driver_info = CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL},

	{USB_DEVICE(0x2040, 0xb111),

	 .driver_info = CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC},

	{USB_DEVICE(0x2040, 0xb120),

	 .driver_info = CX231XX_BOARD_HAUPPAUGE_EXETER},

	{USB_DEVICE(0x2040, 0xb140),

drivers/media/video/cx231xx/cx231xx-core.c

+4 −0
Original line number Diff line number Diff line
@@ -742,6 +742,8 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode) 
		case CX231XX_BOARD_CNXT_RDU_253S:

		case CX231XX_BOARD_HAUPPAUGE_EXETER:

		case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:

		case CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL:

		case CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC:

		errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0);

			break;

		default:
@@ -1381,6 +1383,8 @@ int cx231xx_dev_init(struct cx231xx *dev) 
	case CX231XX_BOARD_CNXT_RDU_253S:

	case CX231XX_BOARD_HAUPPAUGE_EXETER:

	case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:

	case CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL:

	case CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC:

	errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0);

		break;

	default:

drivers/media/video/cx231xx/cx231xx.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
#define CX231XX_BOARD_PV_XCAPTURE_USB 11

#define CX231XX_BOARD_KWORLD_UB430_USB_HYBRID 12

#define CX231XX_BOARD_ICONBIT_U100 13

#define CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL 14

#define CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC 15



/* Limits minimum and default number of buffers */

#define CX231XX_MIN_BUF                 4

CRA Git | Maintained and supported by SUSTech CRA and CCSE