aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@linuxtv.org>2008-12-29 20:39:42 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:40:36 -0500
commit7ed3a7a3113a5399a4591fdf1f2a07c9cd954853 (patch)
treeef6861287ec5df08bf6a98e44e01c6b889785f0f
parente890759220759dfe4f3bea91a2deafb565ec10e9 (diff)
V4L/DVB (10121): em28xx: remove worthless Pinnacle PCTV HD Mini 80e device profile
The Pinnacle 80e cannot be supported since Micronas yanked their driver support for the drx-j chipset at the last minute. Remove the device profile since it cannot work without the drx driver and it being there is only likely to confuse people into thinking the device is supported but not working. Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx1
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c34
-rw-r--r--drivers/media/video/em28xx/em28xx.h1
3 files changed, 0 insertions, 36 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 79fd7f97a366..75bded8a4aa2 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -56,6 +56,5 @@
56 56 -> Pinnacle Hybrid Pro (2) (em2882) [2304:0226] 56 56 -> Pinnacle Hybrid Pro (2) (em2882) [2304:0226]
57 57 -> Kworld PlusTV HD Hybrid 330 (em2883) [eb1a:a316] 57 57 -> Kworld PlusTV HD Hybrid 330 (em2883) [eb1a:a316]
58 58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041] 58 58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
59 59 -> Pinnacle PCTV HD Mini (em2874) [2304:023f]
60 60 -> Hauppauge WinTV HVR 850 (em2883) [2040:651f] 59 60 -> Hauppauge WinTV HVR 850 (em2883) [2040:651f]
61 61 -> Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840) 60 61 -> Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 41d86e6f69c4..84191c9dc54d 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -110,17 +110,6 @@ static struct em28xx_reg_seq default_tuner_gpio[] = {
110 { -1, -1, -1, -1}, 110 { -1, -1, -1, -1},
111}; 111};
112 112
113/* Pinnacle PCTV HD Mini (80e) GPIOs
114 0-5: not used
115 6: demod reset, active low
116 7: LED on, active high */
117static struct em28xx_reg_seq em2874_pinnacle_80e_digital[] = {
118 {EM28XX_R06_I2C_CLK, 0x45, 0xff, 10}, /*400 KHz*/
119 {EM2874_R80_GPIO, 0x80, 0xff, 100},/*Demod reset*/
120 {EM2874_R80_GPIO, 0xc0, 0xff, 10},
121 { -1, -1, -1, -1},
122};
123
124/* 113/*
125 * Board definitions 114 * Board definitions
126 */ 115 */
@@ -1228,27 +1217,6 @@ struct em28xx_board em28xx_boards[] = {
1228 .amux = EM28XX_AMUX_LINE_IN, 1217 .amux = EM28XX_AMUX_LINE_IN,
1229 } }, 1218 } },
1230 }, 1219 },
1231
1232 /* em2874 tuners are DVB only */
1233
1234 [EM2874_BOARD_PINNACLE_PCTV_80E] = {
1235 .name = "Pinnacle PCTV HD Mini",
1236 .tuner_type = TUNER_ABSENT,
1237 .has_dvb = 1,
1238 .dvb_gpio = em2874_pinnacle_80e_digital,
1239 .ir_codes = ir_codes_pinnacle_pctv_hd,
1240 .decoder = EM28XX_NODECODER,
1241 .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE |
1242 EM2874_I2C_SECONDARY_BUS_SELECT |
1243 EM28XX_I2C_FREQ_400_KHZ,
1244#ifdef DJH_DEBUG
1245 .input = { {
1246 .type = EM28XX_VMUX_TELEVISION,
1247 .vmux = TVP5150_COMPOSITE0,
1248 .amux = EM28XX_AMUX_LINE_IN,
1249 } },
1250#endif
1251 },
1252}; 1220};
1253const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); 1221const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
1254 1222
@@ -1342,8 +1310,6 @@ struct usb_device_id em28xx_id_table [] = {
1342 .driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO }, 1310 .driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO },
1343 { USB_DEVICE(0x2304, 0x0227), 1311 { USB_DEVICE(0x2304, 0x0227),
1344 .driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO }, 1312 .driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO },
1345 { USB_DEVICE(0x2304, 0x023f),
1346 .driver_info = EM2874_BOARD_PINNACLE_PCTV_80E },
1347 { USB_DEVICE(0x0413, 0x6023), 1313 { USB_DEVICE(0x0413, 0x6023),
1348 .driver_info = EM2800_BOARD_LEADTEK_WINFAST_USBII }, 1314 .driver_info = EM2800_BOARD_LEADTEK_WINFAST_USBII },
1349 { USB_DEVICE(0x093b, 0xa005), 1315 { USB_DEVICE(0x093b, 0xa005),
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 650f4ec82185..b5eddc26388e 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -96,7 +96,6 @@
96#define EM2882_BOARD_PINNACLE_HYBRID_PRO 56 96#define EM2882_BOARD_PINNACLE_HYBRID_PRO 56
97#define EM2883_BOARD_KWORLD_HYBRID_A316 57 97#define EM2883_BOARD_KWORLD_HYBRID_A316 57
98#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58 98#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58
99#define EM2874_BOARD_PINNACLE_PCTV_80E 59
100#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60 99#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60
101#define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2 61 100#define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2 61
102 101