diff options
author | Christopher Reimer <linux@creimer.net> | 2014-06-30 09:44:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-26 14:00:01 -0400 |
commit | 93961435d07df8f07732890f96fd953a8953be2d (patch) | |
tree | 6c3c06c16a6a13f2c19527e9e10ac2275d6a9150 | |
parent | 0ee4c2ac1858a60ea2458347f12371437f922400 (diff) |
[media] ddbridge: Add IDs for several newer Digital Devices cards
This patch adds the necessary IDs for the following dvb cards:
Digital Devices Octopus Mini
Digital Devices Cine S2 V6.5
Digital Devices DVBCT V6.1
Digital Devices Octopus V3
Mystique SaTiX-S2 V3
All these changes are taken from the official driver package by Digital
Devices.
http://download.digital-devices.de/download/linux/
[m.chehab@samsung.com: Fixed whitespace mangling]
Signed-off-by: Christopher Reimer <mail@creimer.net>
Tested-by: "D. Herrendoerfer" <d.herrendoerfer@herrendoerfer.name>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/pci/ddbridge/ddbridge-core.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index fb52bda8d45f..da8f848be3b8 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c | |||
@@ -1663,11 +1663,40 @@ static struct ddb_info ddb_octopus_le = { | |||
1663 | .port_num = 2, | 1663 | .port_num = 2, |
1664 | }; | 1664 | }; |
1665 | 1665 | ||
1666 | static struct ddb_info ddb_octopus_mini = { | ||
1667 | .type = DDB_OCTOPUS, | ||
1668 | .name = "Digital Devices Octopus Mini", | ||
1669 | .port_num = 4, | ||
1670 | }; | ||
1671 | |||
1666 | static struct ddb_info ddb_v6 = { | 1672 | static struct ddb_info ddb_v6 = { |
1667 | .type = DDB_OCTOPUS, | 1673 | .type = DDB_OCTOPUS, |
1668 | .name = "Digital Devices Cine S2 V6 DVB adapter", | 1674 | .name = "Digital Devices Cine S2 V6 DVB adapter", |
1669 | .port_num = 3, | 1675 | .port_num = 3, |
1670 | }; | 1676 | }; |
1677 | static struct ddb_info ddb_v6_5 = { | ||
1678 | .type = DDB_OCTOPUS, | ||
1679 | .name = "Digital Devices Cine S2 V6.5 DVB adapter", | ||
1680 | .port_num = 4, | ||
1681 | }; | ||
1682 | |||
1683 | static struct ddb_info ddb_dvbct = { | ||
1684 | .type = DDB_OCTOPUS, | ||
1685 | .name = "Digital Devices DVBCT V6.1 DVB adapter", | ||
1686 | .port_num = 3, | ||
1687 | }; | ||
1688 | |||
1689 | static struct ddb_info ddb_satixS2v3 = { | ||
1690 | .type = DDB_OCTOPUS, | ||
1691 | .name = "Mystique SaTiX-S2 V3 DVB adapter", | ||
1692 | .port_num = 3, | ||
1693 | }; | ||
1694 | |||
1695 | static struct ddb_info ddb_octopusv3 = { | ||
1696 | .type = DDB_OCTOPUS, | ||
1697 | .name = "Digital Devices Octopus V3 DVB adapter", | ||
1698 | .port_num = 4, | ||
1699 | }; | ||
1671 | 1700 | ||
1672 | #define DDVID 0xdd01 /* Digital Devices Vendor ID */ | 1701 | #define DDVID 0xdd01 /* Digital Devices Vendor ID */ |
1673 | 1702 | ||
@@ -1680,8 +1709,12 @@ static const struct pci_device_id ddb_id_tbl[] = { | |||
1680 | DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus), | 1709 | DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus), |
1681 | DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus), | 1710 | DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus), |
1682 | DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le), | 1711 | DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le), |
1683 | DDB_ID(DDVID, 0x0003, DDVID, 0x0010, ddb_octopus), | 1712 | DDB_ID(DDVID, 0x0003, DDVID, 0x0010, ddb_octopus_mini), |
1684 | DDB_ID(DDVID, 0x0003, DDVID, 0x0020, ddb_v6), | 1713 | DDB_ID(DDVID, 0x0003, DDVID, 0x0020, ddb_v6), |
1714 | DDB_ID(DDVID, 0x0003, DDVID, 0x0021, ddb_v6_5), | ||
1715 | DDB_ID(DDVID, 0x0003, DDVID, 0x0030, ddb_dvbct), | ||
1716 | DDB_ID(DDVID, 0x0003, DDVID, 0xdb03, ddb_satixS2v3), | ||
1717 | DDB_ID(DDVID, 0x0005, DDVID, 0x0004, ddb_octopusv3), | ||
1685 | /* in case sub-ids got deleted in flash */ | 1718 | /* in case sub-ids got deleted in flash */ |
1686 | DDB_ID(DDVID, 0x0003, PCI_ANY_ID, PCI_ANY_ID, ddb_none), | 1719 | DDB_ID(DDVID, 0x0003, PCI_ANY_ID, PCI_ANY_ID, ddb_none), |
1687 | {0} | 1720 | {0} |