Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 09bc1942c031686bfcf897746b6baf9d42c92ed5

Authored by Devin Heitmueller
Committed by Mauro Carvalho Chehab
1 parent 7030f52bbe
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 3 changed files with 5 additions and 6 deletions Side-by-side Diff

Documentation/video4linux/CARDLIST.em28xx
Diff comments   View file @ 09bc194
... ... @@ -54,7 +54,7 @@
54 54 53 -> Pinnacle Hybrid Pro (em2881)
55 55 54 -> Kworld VS-DVB-T 323UR (em2882) [eb1a:e323]
56 56 55 -> Terratec Cinnergy Hybrid T USB XS (em2882) (em2882) [0ccd:005e,0ccd:0042]
57   - 56 -> Pinnacle Hybrid Pro (2) (em2882) [2304:0226]
  57 + 56 -> Pinnacle Hybrid Pro (330e) (em2882) [2304:0226]
58 58 57 -> Kworld PlusTV HD Hybrid 330 (em2883) [eb1a:a316]
59 59 58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
60 60 60 -> Hauppauge WinTV HVR 850 (em2883) [2040:651f]
drivers/media/video/em28xx/em28xx-cards.c
Diff comments   View file @ 09bc194
... ... @@ -1457,8 +1457,8 @@
1457 1457 .gpio = pinnacle_hybrid_pro_analog,
1458 1458 } },
1459 1459 },
1460   - [EM2882_BOARD_PINNACLE_HYBRID_PRO] = {
1461   - .name = "Pinnacle Hybrid Pro (2)",
  1460 + [EM2882_BOARD_PINNACLE_HYBRID_PRO_330E] = {
  1461 + .name = "Pinnacle Hybrid Pro (330e)",
1462 1462 .valid = EM28XX_BOARD_NOT_VALIDATED,
1463 1463 .tuner_type = TUNER_XC2028,
1464 1464 .tuner_gpio = default_tuner_gpio,
... ... @@ -1872,7 +1872,7 @@
1872 1872 { USB_DEVICE(0x2304, 0x021a),
1873 1873 .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
1874 1874 { USB_DEVICE(0x2304, 0x0226),
1875   - .driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO },
  1875 + .driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO_330E },
1876 1876 { USB_DEVICE(0x2304, 0x0227),
1877 1877 .driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO },
1878 1878 { USB_DEVICE(0x0413, 0x6023),
... ... @@ -2238,7 +2238,6 @@
2238 2238 ctl->demod = XC3028_FE_ZARLINK456;
2239 2239 break;
2240 2240 case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
2241   - /* djh - Not sure which demod we need here */
2242 2241 ctl->demod = XC3028_FE_DEFAULT;
2243 2242 break;
2244 2243 case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
drivers/media/video/em28xx/em28xx.h
Diff comments   View file @ 09bc194
... ... @@ -97,7 +97,7 @@
97 97 #define EM2881_BOARD_PINNACLE_HYBRID_PRO 53
98 98 #define EM2882_BOARD_KWORLD_VS_DVBT 54
99 99 #define EM2882_BOARD_TERRATEC_HYBRID_XS 55
100   -#define EM2882_BOARD_PINNACLE_HYBRID_PRO 56
  100 +#define EM2882_BOARD_PINNACLE_HYBRID_PRO_330E 56
101 101 #define EM2883_BOARD_KWORLD_HYBRID_330U 57
102 102 #define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58
103 103 #define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60