summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorBenjamin Larsson <benjamin@southpole.se>2015-11-28 23:53:31 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-25 12:43:53 -0200
commitc5d89a49fcb47e27a9ef96b63bdbe7fbf0504bd8 (patch)
tree9976212e8aae2ef9794d195c08159ac401c17420 /drivers/media
parent464254e5dbd60124936d47be6679a23b42840b51 (diff)
downloadop-kernel-dev-c5d89a49fcb47e27a9ef96b63bdbe7fbf0504bd8.zip
op-kernel-dev-c5d89a49fcb47e27a9ef96b63bdbe7fbf0504bd8.tar.gz
[media] Add support for Terratec Cinergy S2 Rev.4
Also Add Terratec Cinergy S2 usb id's Signed-off-by: Benjamin Larsson <benjamin@southpole.se> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb-core/dvb-usb-ids.h4
-rw-r--r--drivers/media/usb/dvb-usb-v2/dvbsky.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h
index 7f5d086..750d23f 100644
--- a/drivers/media/dvb-core/dvb-usb-ids.h
+++ b/drivers/media/dvb-core/dvb-usb-ids.h
@@ -256,6 +256,10 @@
#define USB_PID_TERRATEC_CINERGY_T_EXPRESS 0x0062
#define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078
#define USB_PID_TERRATEC_CINERGY_T_XXS_2 0x00ab
+#define USB_PID_TERRATEC_CINERGY_S2_R1 0x00a8
+#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_H7 0x10b4
#define USB_PID_TERRATEC_H7_2 0x10a3
#define USB_PID_TERRATEC_H7_3 0x10a5
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
index 1dd9625..2d922b9 100644
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
@@ -851,6 +851,9 @@ static const struct usb_device_id dvbsky_id_table[] = {
USB_PID_TERRATEC_H7_3,
&dvbsky_t680c_props, "Terratec H7 Rev.4",
RC_MAP_TT_1500) },
+ { DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R4,
+ &dvbsky_s960_props, "Terratec Cinergy S2 Rev.4",
+ RC_MAP_DVBSKY) },
{ }
};
MODULE_DEVICE_TABLE(usb, dvbsky_id_table);
OpenPOWER on IntegriCloud