Skip to content

Commit

Permalink
V4L/DVB (9537): Add TerraTec Cinergy S USB support
Browse files Browse the repository at this point in the history
Add TerraTec Cinergy S USB support

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Acked-by: Thorsten Leupold <th86@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Igor M. Liplianin authored and Mauro Carvalho Chehab committed Dec 29, 2008
1 parent 5cff91a commit 4cc0edf
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/media/dvb/dvb-usb/dw2102.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
#define USB_PID_DW2104 0x2104
#endif

#ifndef USB_PID_CINERGY_S
#define USB_PID_CINERGY_S 0x0064
#endif

#define DW210X_READ_MSG 0
#define DW210X_WRITE_MSG 1

Expand Down Expand Up @@ -577,6 +581,7 @@ static struct usb_device_id dw2102_table[] = {
{USB_DEVICE(USB_VID_CYPRESS, 0x2101)},
{USB_DEVICE(USB_VID_CYPRESS, 0x2104)},
{USB_DEVICE(0x9022, 0xd650)},
{USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},
{ }
};

Expand Down Expand Up @@ -646,6 +651,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
DW210X_WRITE_MSG);
break;
case USB_PID_CINERGY_S:
case USB_PID_DW2102:
dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
DW210X_WRITE_MSG);
Expand Down Expand Up @@ -725,7 +731,7 @@ static struct dvb_usb_device_properties dw2102_properties = {
},
}
},
.num_device_descs = 2,
.num_device_descs = 3,
.devices = {
{"DVBWorld DVB-S 2102 USB2.0",
{&dw2102_table[0], NULL},
Expand All @@ -735,6 +741,10 @@ static struct dvb_usb_device_properties dw2102_properties = {
{&dw2102_table[1], NULL},
{NULL},
},
{"TerraTec Cinergy S USB",
{&dw2102_table[4], NULL},
{NULL},
},
}
};

Expand Down

0 comments on commit 4cc0edf

Please sign in to comment.