Add new hardware ids to various drivers, as included in 2.6.33-rc3
svn path=/dists/trunk/linux-2.6/; revision=14934
This commit is contained in:
Ben Hutchings
parent
a8b152deb7
commit
72d2550619
|
|
@ -6,6 +6,12 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
|
|||
* ar9170: Add device id for D-Link DWA 160 A2
|
||||
* powerpc/fsl: Add device ids for new QoirQ chips
|
||||
* arm/dm646x: Add hardware id for DM6467 rev 3.x
|
||||
* hda: Add device ids for Nvidia G2xx series
|
||||
* smsusb: Add device ids for new Hauppauge devices
|
||||
* mos7850: Add device ids for new B&B Electronics devices
|
||||
* ftdi_sio: Add device ids for new B&B Electronics devices
|
||||
* saa7134: Add device id and description for Asus Europa DVB-T card
|
||||
* x86/iTCO-wdt: Add device ids for Intel 'Ibex Peak' PCH
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Sun, 10 Jan 2010 17:38:50 +0000
|
||||
|
||||
|
|
|
|||
66
debian/patches/features/all/ftdi_sio-add-USB-device-ID-s-for-B-B-Electronics.patch
vendored
Normal file
66
debian/patches/features/all/ftdi_sio-add-USB-device-ID-s-for-B-B-Electronics.patch
vendored
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
From a8cbd90a0410096e152f68a4e114a8b5c7abb49b Mon Sep 17 00:00:00 2001
|
||||
From: Cliff Brake <cbrake@bec-systems.com>
|
||||
Date: Tue, 1 Dec 2009 09:53:42 -0500
|
||||
Subject: [PATCH] USB: ftdi_sio: add USB device ID's for B&B Electronics line
|
||||
|
||||
Reviewed-by: John Pilles <jpilles@bb-elec.com>
|
||||
Signed-off-by: Cliff Brake <cbrake@bec-systems.com>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
||||
---
|
||||
drivers/usb/serial/ftdi_sio.c | 14 ++++++++++++++
|
||||
drivers/usb/serial/ftdi_sio.h | 14 ++++++++++++++
|
||||
2 files changed, 28 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
|
||||
index a8103e0..f99498f 100644
|
||||
--- a/drivers/usb/serial/ftdi_sio.c
|
||||
+++ b/drivers/usb/serial/ftdi_sio.c
|
||||
@@ -598,6 +598,20 @@ static struct usb_device_id id_table_combined [] = {
|
||||
{ USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) },
|
||||
{ USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) },
|
||||
{ USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_USOPTL4_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_USPTL4_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_USO9ML2DR_2_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_USO9ML2DR_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_USOPTL4DR2_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_USOPTL4DR_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_485USB9F_2W_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_485USB9F_4W_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_232USB9M_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_485USBTB_2W_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_485USBTB_4W_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_TTL5USB9M_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_TTL3USB9M_PID) },
|
||||
+ { USB_DEVICE(BANDB_VID, BANDB_ZZ_PROG1_USB_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, EVER_ECO_PRO_CDS) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) },
|
||||
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
|
||||
index 6f31e0d..4586a24 100644
|
||||
--- a/drivers/usb/serial/ftdi_sio.h
|
||||
+++ b/drivers/usb/serial/ftdi_sio.h
|
||||
@@ -662,6 +662,20 @@
|
||||
#define BANDB_USOTL4_PID 0xAC01 /* USOTL4 Isolated RS-485 Converter */
|
||||
#define BANDB_USTL4_PID 0xAC02 /* USTL4 RS-485 Converter */
|
||||
#define BANDB_USO9ML2_PID 0xAC03 /* USO9ML2 Isolated RS-232 Converter */
|
||||
+#define BANDB_USOPTL4_PID 0xAC11
|
||||
+#define BANDB_USPTL4_PID 0xAC12
|
||||
+#define BANDB_USO9ML2DR_2_PID 0xAC16
|
||||
+#define BANDB_USO9ML2DR_PID 0xAC17
|
||||
+#define BANDB_USOPTL4DR2_PID 0xAC18 /* USOPTL4R-2 2-port Isolated RS-232 Converter */
|
||||
+#define BANDB_USOPTL4DR_PID 0xAC19
|
||||
+#define BANDB_485USB9F_2W_PID 0xAC25
|
||||
+#define BANDB_485USB9F_4W_PID 0xAC26
|
||||
+#define BANDB_232USB9M_PID 0xAC27
|
||||
+#define BANDB_485USBTB_2W_PID 0xAC33
|
||||
+#define BANDB_485USBTB_4W_PID 0xAC34
|
||||
+#define BANDB_TTL5USB9M_PID 0xAC49
|
||||
+#define BANDB_TTL3USB9M_PID 0xAC50
|
||||
+#define BANDB_ZZ_PROG1_USB_PID 0xBA02
|
||||
|
||||
/*
|
||||
* RM Michaelides CANview USB (http://www.rmcan.com)
|
||||
--
|
||||
1.6.5.7
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From 6dd7dc767e35cfbb38f8c63a50b1c27acad25920 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Ringel <stefan.ringel@arcor.de>
|
||||
Date: Mon, 14 Dec 2009 11:27:11 +0100
|
||||
Subject: [PATCH] ALSA: hda - Add PCI IDs for Nvidia G2xx-series
|
||||
|
||||
Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
sound/pci/hda/hda_intel.c | 3 +++
|
||||
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
|
||||
index e54420e..9b56f93 100644
|
||||
--- a/sound/pci/hda/hda_intel.c
|
||||
+++ b/sound/pci/hda/hda_intel.c
|
||||
@@ -2713,6 +2713,9 @@ static struct pci_device_id azx_ids[] = {
|
||||
{ PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
{ PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
{ PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
+ { PCI_DEVICE(0x10de, 0x0be2), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
+ { PCI_DEVICE(0x10de, 0x0be3), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
+ { PCI_DEVICE(0x10de, 0x0be4), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
{ PCI_DEVICE(0x10de, 0x0d94), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
{ PCI_DEVICE(0x10de, 0x0d95), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
{ PCI_DEVICE(0x10de, 0x0d96), .driver_data = AZX_DRIVER_NVIDIA },
|
||||
--
|
||||
1.6.5.7
|
||||
|
||||
67
debian/patches/features/all/mos7840-add-device-IDs-for-B-B-electronics-devices.patch
vendored
Normal file
67
debian/patches/features/all/mos7840-add-device-IDs-for-B-B-electronics-devices.patch
vendored
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
From acf509ae28301d78b022c534c26b1e4765c18f2b Mon Sep 17 00:00:00 2001
|
||||
From: Cliff Brake <cbrake@bec-systems.com>
|
||||
Date: Tue, 1 Dec 2009 09:53:43 -0500
|
||||
Subject: [PATCH] USB: mos7840: add device IDs for B&B electronics devices
|
||||
|
||||
Reviewed-by: John Pilles <jpilles@bb-elec.com>
|
||||
Signed-off-by: Cliff Brake <cbrake@bec-systems.com>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
||||
---
|
||||
drivers/usb/serial/mos7840.c | 24 +++++++++++++++++++++---
|
||||
1 files changed, 21 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
|
||||
index f11abf5..485fa9c 100644
|
||||
--- a/drivers/usb/serial/mos7840.c
|
||||
+++ b/drivers/usb/serial/mos7840.c
|
||||
@@ -121,8 +121,14 @@
|
||||
* moschip_id_table_combined
|
||||
*/
|
||||
#define USB_VENDOR_ID_BANDB 0x0856
|
||||
-#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
|
||||
+#define BANDB_DEVICE_ID_USO9ML2_2 0xAC22
|
||||
+#define BANDB_DEVICE_ID_USO9ML2_4 0xAC24
|
||||
+#define BANDB_DEVICE_ID_US9ML2_2 0xAC29
|
||||
+#define BANDB_DEVICE_ID_US9ML2_4 0xAC30
|
||||
+#define BANDB_DEVICE_ID_USPTL4_2 0xAC31
|
||||
+#define BANDB_DEVICE_ID_USPTL4_4 0xAC32
|
||||
#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42
|
||||
+#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
|
||||
|
||||
/* This driver also supports
|
||||
* ATEN UC2324 device using Moschip MCS7840
|
||||
@@ -177,8 +183,14 @@
|
||||
static struct usb_device_id moschip_port_id_table[] = {
|
||||
{USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)},
|
||||
{USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)},
|
||||
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_2)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_4)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_2)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)},
|
||||
{USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
|
||||
{USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)},
|
||||
{USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)},
|
||||
{} /* terminating entry */
|
||||
@@ -187,8 +199,14 @@ static struct usb_device_id moschip_port_id_table[] = {
|
||||
static __devinitdata struct usb_device_id moschip_id_table_combined[] = {
|
||||
{USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)},
|
||||
{USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)},
|
||||
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_2)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_4)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_2)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)},
|
||||
{USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)},
|
||||
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
|
||||
{USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)},
|
||||
{USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)},
|
||||
{} /* terminating entry */
|
||||
--
|
||||
1.6.5.7
|
||||
|
||||
114
debian/patches/features/all/saa7134-Add-support-for-Asus-Europa-Hybrid-DVB.patch
vendored
Normal file
114
debian/patches/features/all/saa7134-Add-support-for-Asus-Europa-Hybrid-DVB.patch
vendored
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
From e3c6e1aaa5db7822524f5b1355960fd732910068 Mon Sep 17 00:00:00 2001
|
||||
From: Danny Wood <danwood76@gmail.com>
|
||||
Date: Sun, 20 Sep 2009 12:14:21 -0300
|
||||
Subject: [PATCH] V4L/DVB (13168): Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
|
||||
|
||||
Adds the device IDs and driver linking to allow the Asus Europa DVB-T
|
||||
card to operate with these drivers.
|
||||
The device has a SAA7134 chipset with a TD1316 Hybrid Tuner.
|
||||
All inputs work on the card including switching between DVB-T and
|
||||
Analogue TV, there is also no IR with this card.
|
||||
|
||||
[mchehab@redhat.com: CodingStyle fixes]
|
||||
|
||||
Signed-off-by: Danny Wood <danwood76@gmail.com>
|
||||
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
||||
---
|
||||
Documentation/video4linux/CARDLIST.saa7134 | 1 +
|
||||
drivers/media/video/saa7134/saa7134-cards.c | 31 +++++++++++++++++++++++++++
|
||||
drivers/media/video/saa7134/saa7134-dvb.c | 1 +
|
||||
drivers/media/video/saa7134/saa7134.h | 1 +
|
||||
4 files changed, 34 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
|
||||
index 2620d60..94e255a 100644
|
||||
--- a/Documentation/video4linux/CARDLIST.saa7134
|
||||
+++ b/Documentation/video4linux/CARDLIST.saa7134
|
||||
@@ -172,3 +172,4 @@
|
||||
171 -> Beholder BeholdTV X7 [5ace:7595]
|
||||
172 -> RoverMedia TV Link Pro FM [19d1:0138]
|
||||
173 -> Zolid Hybrid TV Tuner PCI [1131:2004]
|
||||
+174 -> Asus Europa Hybrid OEM [1043:4847]
|
||||
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
|
||||
index 7de7f1f..bdb6138 100644
|
||||
--- a/drivers/media/video/saa7134/saa7134-cards.c
|
||||
+++ b/drivers/media/video/saa7134/saa7134-cards.c
|
||||
@@ -5280,6 +5280,30 @@ struct saa7134_board saa7134_boards[] = {
|
||||
.amux = TV,
|
||||
},
|
||||
},
|
||||
+ [SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
|
||||
+ .name = "Asus Europa Hybrid OEM",
|
||||
+ .audio_clock = 0x00187de7,
|
||||
+ .tuner_type = TUNER_PHILIPS_TD1316,
|
||||
+ .radio_type = UNSET,
|
||||
+ .tuner_addr = 0x61,
|
||||
+ .radio_addr = ADDR_UNSET,
|
||||
+ .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
|
||||
+ .mpeg = SAA7134_MPEG_DVB,
|
||||
+ .inputs = { {
|
||||
+ .name = name_tv,
|
||||
+ .vmux = 3,
|
||||
+ .amux = TV,
|
||||
+ .tv = 1,
|
||||
+ }, {
|
||||
+ .name = name_comp1,
|
||||
+ .vmux = 4,
|
||||
+ .amux = LINE2,
|
||||
+ }, {
|
||||
+ .name = name_svideo,
|
||||
+ .vmux = 8,
|
||||
+ .amux = LINE2,
|
||||
+ } },
|
||||
+ },
|
||||
|
||||
};
|
||||
|
||||
@@ -6419,6 +6443,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
|
||||
.subdevice = 0x2004,
|
||||
.driver_data = SAA7134_BOARD_ZOLID_HYBRID_PCI,
|
||||
}, {
|
||||
+ .vendor = PCI_VENDOR_ID_PHILIPS,
|
||||
+ .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
|
||||
+ .subvendor = 0x1043,
|
||||
+ .subdevice = 0x4847,
|
||||
+ .driver_data = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
|
||||
+ }, {
|
||||
/* --- boards without eeprom + subsystem ID --- */
|
||||
.vendor = PCI_VENDOR_ID_PHILIPS,
|
||||
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
|
||||
@@ -7080,6 +7110,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
|
||||
/* break intentionally omitted */
|
||||
case SAA7134_BOARD_VIDEOMATE_DVBT_300:
|
||||
case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
|
||||
+ case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
|
||||
{
|
||||
|
||||
/* The Philips EUROPA based hybrid boards have the tuner
|
||||
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
|
||||
index 96d3668..cd31284 100644
|
||||
--- a/drivers/media/video/saa7134/saa7134-dvb.c
|
||||
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
|
||||
@@ -1131,6 +1131,7 @@ static int dvb_init(struct saa7134_dev *dev)
|
||||
break;
|
||||
case SAA7134_BOARD_PHILIPS_EUROPA:
|
||||
case SAA7134_BOARD_VIDEOMATE_DVBT_300:
|
||||
+ case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
|
||||
fe0->dvb.frontend = dvb_attach(tda10046_attach,
|
||||
&philips_europa_config,
|
||||
&dev->i2c_adap);
|
||||
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
|
||||
index f8697d4..94e1a3b 100644
|
||||
--- a/drivers/media/video/saa7134/saa7134.h
|
||||
+++ b/drivers/media/video/saa7134/saa7134.h
|
||||
@@ -297,6 +297,7 @@ struct saa7134_format {
|
||||
#define SAA7134_BOARD_BEHOLD_X7 171
|
||||
#define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
|
||||
#define SAA7134_BOARD_ZOLID_HYBRID_PCI 173
|
||||
+#define SAA7134_BOARD_ASUS_EUROPA_HYBRID 174
|
||||
|
||||
#define SAA7134_MAXBOARDS 32
|
||||
#define SAA7134_INPUT_MAX 8
|
||||
--
|
||||
1.6.5.7
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
From 20d15a200d34cfb7141fb4558895d7d5233db84b Mon Sep 17 00:00:00 2001
|
||||
From: Michael Krufky <mkrufky@kernellabs.com>
|
||||
Date: Mon, 30 Nov 2009 18:22:10 -0300
|
||||
Subject: [PATCH] V4L/DVB (13569): smsusb: add autodetection support for five additional Hauppauge USB IDs
|
||||
|
||||
Add support for five new Hauppauge Device USB IDs:
|
||||
|
||||
2040:b980
|
||||
2040:b990
|
||||
2040:c010
|
||||
2040:c080
|
||||
2040:c090
|
||||
|
||||
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
|
||||
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
||||
---
|
||||
drivers/media/dvb/siano/smsusb.c | 10 ++++++++++
|
||||
1 files changed, 10 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
|
||||
index 8f88a58..6b03dbf 100644
|
||||
--- a/drivers/media/dvb/siano/smsusb.c
|
||||
+++ b/drivers/media/dvb/siano/smsusb.c
|
||||
@@ -533,8 +533,18 @@ struct usb_device_id smsusb_id_table[] = {
|
||||
.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
|
||||
{ USB_DEVICE(0x2040, 0xb910),
|
||||
.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
|
||||
+ { USB_DEVICE(0x2040, 0xb980),
|
||||
+ .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
|
||||
+ { USB_DEVICE(0x2040, 0xb990),
|
||||
+ .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
|
||||
{ USB_DEVICE(0x2040, 0xc000),
|
||||
.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
|
||||
+ { USB_DEVICE(0x2040, 0xc010),
|
||||
+ .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
|
||||
+ { USB_DEVICE(0x2040, 0xc080),
|
||||
+ .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
|
||||
+ { USB_DEVICE(0x2040, 0xc090),
|
||||
+ .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
|
||||
--
|
||||
1.6.5.7
|
||||
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
From 79e8941dda254505bb8af37b3a009165dfb7e98a Mon Sep 17 00:00:00 2001
|
||||
From: Seth Heasley <seth.heasley@intel.com>
|
||||
Date: Wed, 11 Nov 2009 02:24:01 +0100
|
||||
Subject: [PATCH] [WATCHDOG] iTCO_wdt: Add support for Intel Ibex Peak
|
||||
|
||||
Add the Intel Ibex Peak (PCH) Device IDs to iTCO_wdt.c.
|
||||
|
||||
Signed-off-by: Seth Heasley <seth.heasley@intel.com>
|
||||
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
|
||||
---
|
||||
drivers/watchdog/iTCO_wdt.c | 13 ++++++++++++-
|
||||
1 files changed, 12 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
|
||||
index 6a51edd..4bd3877 100644
|
||||
--- a/drivers/watchdog/iTCO_wdt.c
|
||||
+++ b/drivers/watchdog/iTCO_wdt.c
|
||||
@@ -54,7 +54,9 @@
|
||||
* 82801JIB (ICH10) : document number 319973-002, 319974-002,
|
||||
* 82801JIR (ICH10R) : document number 319973-002, 319974-002,
|
||||
* 82801JD (ICH10D) : document number 319973-002, 319974-002,
|
||||
- * 82801JDO (ICH10DO) : document number 319973-002, 319974-002
|
||||
+ * 82801JDO (ICH10DO) : document number 319973-002, 319974-002,
|
||||
+ * 5 Series (PCH) : document number 322169-001, 322170-001,
|
||||
+ * 3400 Series (PCH) : document number 322169-001, 322170-001
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -122,6 +124,9 @@ enum iTCO_chipsets {
|
||||
TCO_ICH10R, /* ICH10R */
|
||||
TCO_ICH10D, /* ICH10D */
|
||||
TCO_ICH10DO, /* ICH10DO */
|
||||
+ TCO_PCH, /* PCH Desktop Full Featured */
|
||||
+ TCO_PCHM, /* PCH Mobile Full Featured */
|
||||
+ TCO_PCHMSFF, /* PCH Mobile SFF Full Featured */
|
||||
};
|
||||
|
||||
static struct {
|
||||
@@ -162,6 +167,9 @@ static struct {
|
||||
{"ICH10R", 2},
|
||||
{"ICH10D", 2},
|
||||
{"ICH10DO", 2},
|
||||
+ {"PCH Desktop Full Featured", 2},
|
||||
+ {"PCH Mobile Full Featured", 2},
|
||||
+ {"PCH Mobile SFF Full Featured", 2},
|
||||
{NULL, 0}
|
||||
};
|
||||
|
||||
@@ -230,6 +238,9 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
|
||||
{ ITCO_PCI_DEVICE(0x3a16, TCO_ICH10R)},
|
||||
{ ITCO_PCI_DEVICE(0x3a1a, TCO_ICH10D)},
|
||||
{ ITCO_PCI_DEVICE(0x3a14, TCO_ICH10DO)},
|
||||
+ { ITCO_PCI_DEVICE(0x3b00, TCO_PCH)},
|
||||
+ { ITCO_PCI_DEVICE(0x3b01, TCO_PCHM)},
|
||||
+ { ITCO_PCI_DEVICE(0x3b0d, TCO_PCHMSFF)},
|
||||
{ 0, }, /* End of list */
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);
|
||||
--
|
||||
1.6.5.7
|
||||
|
||||
|
|
@ -4,3 +4,9 @@
|
|||
+ features/all/ar9170-Add-support-for-D-Link-DWA-160-A2.patc
|
||||
+ features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch
|
||||
+ features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch
|
||||
+ features/all/hda-Add-PCI-IDs-for-Nvidia-G2xx-series.patch
|
||||
+ features/all/smsusb-add-5-Hauppauge-USB-IDs.patch
|
||||
+ features/all/mos7840-add-device-IDs-for-B-B-electronics-devices.patch
|
||||
+ features/all/ftdi_sio-add-USB-device-ID-s-for-B-B-Electronics.patch
|
||||
+ features/all/saa7134-Add-support-for-Asus-Europa-Hybrid-DVB.patch
|
||||
+ features/x86/iTCO_wdt-Add-support-for-Intel-Ibex-Peak.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue