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>

diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 79fd7f97a366c045e5b070e92faab99b2d2e31ec..75bded8a4aa2e449b09c4454da01b3eeae76d022 100644 (file)
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -56,6 +56,5 @@
  56 -> Pinnacle Hybrid Pro (2)                  (em2882)        [2304:0226]
  57 -> Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]
  58 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]
- 59 -> Pinnacle PCTV HD Mini                    (em2874)        [2304:023f]
  60 -> Hauppauge WinTV HVR 850                  (em2883)        [2040:651f]
  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 41d86e6f69c467c18f3aae5a92478b1e49fef2e8..84191c9dc54d9febd94adfdb6e53392e091ca0b2 100644 (file)
--- 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[] = {
        {  -1,                  -1,             -1,             -1},
 };
 
-/* Pinnacle PCTV HD Mini (80e) GPIOs
-   0-5: not used
-   6:   demod reset, active low
-   7:   LED on, active high */
-static struct em28xx_reg_seq em2874_pinnacle_80e_digital[] = {
-       {EM28XX_R06_I2C_CLK,    0x45,   0xff,             10}, /*400 KHz*/
-       {EM2874_R80_GPIO,       0x80,   0xff,             100},/*Demod reset*/
-       {EM2874_R80_GPIO,       0xc0,   0xff,             10},
-       {  -1,                  -1,     -1,               -1},
-};
-
 /*
  *  Board definitions
  */
@@ -1228,27 +1217,6 @@ struct em28xx_board em28xx_boards[] = {
                        .amux     = EM28XX_AMUX_LINE_IN,
                } },
        },
-
-       /* em2874 tuners are DVB only */
-
-       [EM2874_BOARD_PINNACLE_PCTV_80E] = {
-               .name         = "Pinnacle PCTV HD Mini",
-               .tuner_type   = TUNER_ABSENT,
-               .has_dvb      = 1,
-               .dvb_gpio     = em2874_pinnacle_80e_digital,
-               .ir_codes     = ir_codes_pinnacle_pctv_hd,
-               .decoder      = EM28XX_NODECODER,
-               .i2c_speed    = EM28XX_I2C_CLK_WAIT_ENABLE |
-                               EM2874_I2C_SECONDARY_BUS_SELECT |
-                               EM28XX_I2C_FREQ_400_KHZ,
-#ifdef DJH_DEBUG
-               .input        = { {
-                       .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = TVP5150_COMPOSITE0,
-                       .amux     = EM28XX_AMUX_LINE_IN,
-               } },
-#endif
-       },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
 
@@ -1342,8 +1310,6 @@ struct usb_device_id em28xx_id_table [] = {
                        .driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO },
        { USB_DEVICE(0x2304, 0x0227),
                        .driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO },
-       { USB_DEVICE(0x2304, 0x023f),
-                       .driver_info = EM2874_BOARD_PINNACLE_PCTV_80E },
        { USB_DEVICE(0x0413, 0x6023),
                        .driver_info = EM2800_BOARD_LEADTEK_WINFAST_USBII },
        { USB_DEVICE(0x093b, 0xa005),

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 650f4ec821856f16b9cc58d2017fbf707a901cbf..b5eddc26388e476d4174149b824185482f1c7281 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -96,7 +96,6 @@
 #define EM2882_BOARD_PINNACLE_HYBRID_PRO         56
 #define EM2883_BOARD_KWORLD_HYBRID_A316                  57
 #define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU     58
-#define EM2874_BOARD_PINNACLE_PCTV_80E           59
 #define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850     60
 #define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2    61