V4L/DVB: AZ6027: Fix initialization for some cards

Also add in some more device ID's

Signed-off-by: Oleg Roitburd <oroitburd@gmail.com>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/dvb/dvb-usb/az6027.c
index 7db7d3d94f747de815317adc62f89d8e0a51c54f..60787a28edb389fdeb2f657883fa5eea2e26d8d3 100644 (file)
--- a/drivers/media/dvb/dvb-usb/az6027.c
+++ b/drivers/media/dvb/dvb-usb/az6027.c
@@ -1056,7 +1056,8 @@ int az6027_identify_state(struct usb_device *udev,
 
 static struct usb_device_id az6027_usb_table[] = {
        { USB_DEVICE(USB_VID_AZUREWAVE, USB_PID_AZUREWAVE_AZ6027) },
-       { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_DVBS2CI) },
+       { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_DVBS2CI_V1) },
+       { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_DVBS2CI_V2) },
        { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V1) },
        { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V2) },
        { },
@@ -1101,12 +1102,28 @@ static struct dvb_usb_device_properties az6027_properties = {
        .rc_query         = az6027_rc_query,
        .i2c_algo         = &az6027_i2c_algo,
 
-       .num_device_descs = 1,
+       .num_device_descs = 5,
        .devices = {
                {
                        .name = "AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)",
                        .cold_ids = { &az6027_usb_table[0], NULL },
                        .warm_ids = { NULL },
+               }, {
+                       .name = "TERRATEC S7",
+                       .cold_ids = { &az6027_usb_table[1], NULL },
+                       .warm_ids = { NULL },
+               }, {
+                       .name = "TERRATEC S7 MKII",
+                       .cold_ids = { &az6027_usb_table[2], NULL },
+                       .warm_ids = { NULL },
+               }, {
+                       .name = "Technisat SkyStar USB 2 HD CI",
+                       .cold_ids = { &az6027_usb_table[3], NULL },
+                       .warm_ids = { NULL },
+               }, {
+                       .name = "Technisat SkyStar USB 2 HD CI",
+                       .cold_ids = { &az6027_usb_table[4], NULL },
+                       .warm_ids = { NULL },
                },
                { NULL },
        }

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 0573de50c09a6cf41bcc3684f43040f075e3743b..de1f3af60d533dc66b38c047dc4c4b454f3729fd 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -298,7 +298,8 @@
 #define USB_PID_TVWAY_PLUS                             0x0002
 #define USB_PID_SVEON_STV20                            0xe39d
 #define USB_PID_AZUREWAVE_AZ6027                       0x3275
-#define USB_PID_TERRATEC_DVBS2CI                       0x3275
+#define USB_PID_TERRATEC_DVBS2CI_V1                    0x10a4
+#define USB_PID_TERRATEC_DVBS2CI_V2                    0x10ac
 #define USB_PID_TECHNISAT_USB2_HDCI_V1                 0x0001
 #define USB_PID_TECHNISAT_USB2_HDCI_V2                 0x0002
 #endif