Commit 09bc1942 authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: include model number for PCTV 330e 



Given how PCTV has multiple products with the same model name, include the
model number in the description and #define to make it a little more clear.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7030f52b

Documentation/video4linux/CARDLIST.em28xx

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
 53 -> Pinnacle Hybrid Pro                      (em2881)

 54 -> Kworld VS-DVB-T 323UR                    (em2882)        [eb1a:e323]

 55 -> Terratec Cinnergy Hybrid T USB XS (em2882) (em2882)        [0ccd:005e,0ccd:0042]

 56 -> Pinnacle Hybrid Pro (2)                  (em2882)        [2304:0226]

 56 -> Pinnacle Hybrid Pro (330e)               (em2882)        [2304:0226]

 57 -> Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]

 58 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]

 60 -> Hauppauge WinTV HVR 850                  (em2883)        [2040:651f]

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

+3 −4
Original line number Diff line number Diff line
@@ -1457,8 +1457,8 @@ struct em28xx_board em28xx_boards[] = { 
			.gpio     = pinnacle_hybrid_pro_analog,

		} },

	},

	[EM2882_BOARD_PINNACLE_HYBRID_PRO] = {

		.name         = "Pinnacle Hybrid Pro (2)",

	[EM2882_BOARD_PINNACLE_HYBRID_PRO_330E] = {

		.name         = "Pinnacle Hybrid Pro (330e)",

		.valid        = EM28XX_BOARD_NOT_VALIDATED,

		.tuner_type   = TUNER_XC2028,

		.tuner_gpio   = default_tuner_gpio,
@@ -1872,7 +1872,7 @@ struct usb_device_id em28xx_id_table[] = { 
	{ USB_DEVICE(0x2304, 0x021a),

			.driver_info = EM2820_BOARD_PINNACLE_DVC_90 },

	{ USB_DEVICE(0x2304, 0x0226),

			.driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO },

			.driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO_330E },

	{ USB_DEVICE(0x2304, 0x0227),

			.driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO },

	{ USB_DEVICE(0x0413, 0x6023),
@@ -2238,7 +2238,6 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl) 
		ctl->demod = XC3028_FE_ZARLINK456;

		break;

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:

		/* djh - Not sure which demod we need here */

		ctl->demod = XC3028_FE_DEFAULT;

		break;

	case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:

drivers/media/video/em28xx/em28xx.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
#define EM2881_BOARD_PINNACLE_HYBRID_PRO	  53

#define EM2882_BOARD_KWORLD_VS_DVBT		  54

#define EM2882_BOARD_TERRATEC_HYBRID_XS		  55

#define EM2882_BOARD_PINNACLE_HYBRID_PRO	  56

#define EM2882_BOARD_PINNACLE_HYBRID_PRO_330E	  56

#define EM2883_BOARD_KWORLD_HYBRID_330U                  57

#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU	  58

#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850	  60