media: dvb-usb: Add Cinergy S2 PCIe Dual Port support

Terratec Cinergy S2 PCIe Dual is a PCIe device with two tuners that
actually contains two USB devices. The devices are visible in the
lsusb printout.

Bus 004 Device 002: ID 153b:1182 TerraTec Electronic GmbH Cinergy S2 PCIe Dual Port 2
Bus 003 Device 002: ID 153b:1181 TerraTec Electronic GmbH Cinergy S2 PCIe Dual Port 1

The devices use the Montage M88DS3000/M88TS2022 demod/tuner.

Signed-off-by: Dirk Nehring <dnehring@gmx.net>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index f6d2d23..f96626f 100644 (file)
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -1779,6 +1779,8 @@ enum dw2102_table_entry {
        TERRATEC_CINERGY_S2_R2,
        TERRATEC_CINERGY_S2_R3,
        TERRATEC_CINERGY_S2_R4,
+       TERRATEC_CINERGY_S2_1,
+       TERRATEC_CINERGY_S2_2,
        GOTVIEW_SAT_HD,
        GENIATECH_T220,
        TECHNOTREND_S2_4600,
@@ -1806,9 +1808,16 @@ static struct usb_device_id dw2102_table[] = {
        [X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},
        [TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
        [TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
-       [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R2)},
-       [TERRATEC_CINERGY_S2_R3] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R3)},
-       [TERRATEC_CINERGY_S2_R4] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R4)},
+       [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC,
+                                   USB_PID_TERRATEC_CINERGY_S2_R2)},
+       [TERRATEC_CINERGY_S2_R3] = {USB_DEVICE(USB_VID_TERRATEC,
+                                   USB_PID_TERRATEC_CINERGY_S2_R3)},
+       [TERRATEC_CINERGY_S2_R4] = {USB_DEVICE(USB_VID_TERRATEC,
+                                   USB_PID_TERRATEC_CINERGY_S2_R4)},
+       [TERRATEC_CINERGY_S2_1] = {USB_DEVICE(USB_VID_TERRATEC_2,
+                                  USB_PID_TERRATEC_CINERGY_S2_1)},
+       [TERRATEC_CINERGY_S2_2] = {USB_DEVICE(USB_VID_TERRATEC_2,
+                                  USB_PID_TERRATEC_CINERGY_S2_2)},
        [GOTVIEW_SAT_HD] = {USB_DEVICE(0x1FE1, USB_PID_GOTVIEW_SAT_HD)},
        [GENIATECH_T220] = {USB_DEVICE(0x1f4d, 0xD220)},
        [TECHNOTREND_S2_4600] = {USB_DEVICE(USB_VID_TECHNOTREND,
@@ -2221,7 +2230,7 @@ static struct dvb_usb_device_properties su3000_properties = {
                }},
                }
        },
-       .num_device_descs = 6,
+       .num_device_descs = 8,
        .devices = {
                { "SU3000HD DVB-S USB2.0",
                        { &dw2102_table[GENIATECH_SU3000], NULL },
@@ -2243,6 +2252,14 @@ static struct dvb_usb_device_properties su3000_properties = {
                        { &dw2102_table[TERRATEC_CINERGY_S2_R3], NULL },
                        { NULL },
                },
+               { "Terratec Cinergy S2 PCIe Dual Port 1",
+                       { &dw2102_table[TERRATEC_CINERGY_S2_1], NULL },
+                       { NULL },
+               },
+               { "Terratec Cinergy S2 PCIe Dual Port 2",
+                       { &dw2102_table[TERRATEC_CINERGY_S2_2], NULL },
+                       { NULL },
+               },
                { "GOTVIEW Satellite HD",
                        { &dw2102_table[GOTVIEW_SAT_HD], NULL },
                        { NULL },

diff --git a/include/media/dvb-usb-ids.h b/include/media/dvb-usb-ids.h
index 41f0bf1..d37cb74 100644 (file)
--- a/include/media/dvb-usb-ids.h
+++ b/include/media/dvb-usb-ids.h
@@ -56,6 +56,7 @@
 #define USB_VID_REALTEK                                0x0bda
 #define USB_VID_TECHNOTREND                    0x0b48
 #define USB_VID_TERRATEC                       0x0ccd
+#define USB_VID_TERRATEC_2                     0x153b
 #define USB_VID_TELESTAR                       0x10b9
 #define USB_VID_VISIONPLUS                     0x13d3
 #define USB_VID_SONY                           0x1415
@@ -280,6 +281,8 @@
 #define USB_PID_TERRATEC_CINERGY_S2_R2                 0x00b0
 #define USB_PID_TERRATEC_CINERGY_S2_R3                 0x0102
 #define USB_PID_TERRATEC_CINERGY_S2_R4                 0x0105
+#define USB_PID_TERRATEC_CINERGY_S2_1                  0x1181
+#define USB_PID_TERRATEC_CINERGY_S2_2                  0x1182
 #define USB_PID_TERRATEC_H7                            0x10b4
 #define USB_PID_TERRATEC_H7_2                          0x10a3
 #define USB_PID_TERRATEC_H7_3                          0x10a5