From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Tony Jago <tony@hammertelecom.com.au>,
Steven Toth <stoth@kernellabs.com>,
Mauro Carvalho Chehab <mchehab@redhat.com>,
Stefan Bader <stefan.bader@canonical.com>
Subject: [06/53] [media] saa7164: Add support for another HVR2200 hardware revision
Date: Tue, 22 Nov 2011 16:25:06 -0800 [thread overview]
Message-ID: <20111123002553.435914673@clark.kroah.org> (raw)
In-Reply-To: <20111123002601.GA14467@kroah.com>
3.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Jago <tony@hammertelecom.com.au>
commit 62dd28d0c659db29bdb89cfe9f0aefe42f0adfe9 upstream.
Hauppauge have released a new model rev, sub id 8940, this adds
support.
[stoth@kernellabs.com: I modified Tony's patch slightly in relation to the
card numbering in saa7164.h, appending rather than inserting the new card
- normal practise]
Signed-off-by: Tony Jago <tony@hammertelecom.com.au>
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/media/video/saa7164/saa7164-cards.c | 66 ++++++++++++++++++++++++++++
drivers/media/video/saa7164/saa7164-dvb.c | 1
drivers/media/video/saa7164/saa7164.h | 1
3 files changed, 68 insertions(+)
--- a/drivers/media/video/saa7164/saa7164-cards.c
+++ b/drivers/media/video/saa7164/saa7164-cards.c
@@ -203,6 +203,66 @@ struct saa7164_board saa7164_boards[] =
.i2c_reg_len = REGLEN_8bit,
} },
},
+ [SAA7164_BOARD_HAUPPAUGE_HVR2200_4] = {
+ .name = "Hauppauge WinTV-HVR2200",
+ .porta = SAA7164_MPEG_DVB,
+ .portb = SAA7164_MPEG_DVB,
+ .portc = SAA7164_MPEG_ENCODER,
+ .portd = SAA7164_MPEG_ENCODER,
+ .porte = SAA7164_MPEG_VBI,
+ .portf = SAA7164_MPEG_VBI,
+ .chiprev = SAA7164_CHIP_REV3,
+ .unit = {{
+ .id = 0x1d,
+ .type = SAA7164_UNIT_EEPROM,
+ .name = "4K EEPROM",
+ .i2c_bus_nr = SAA7164_I2C_BUS_0,
+ .i2c_bus_addr = 0xa0 >> 1,
+ .i2c_reg_len = REGLEN_8bit,
+ }, {
+ .id = 0x04,
+ .type = SAA7164_UNIT_TUNER,
+ .name = "TDA18271-1",
+ .i2c_bus_nr = SAA7164_I2C_BUS_1,
+ .i2c_bus_addr = 0xc0 >> 1,
+ .i2c_reg_len = REGLEN_8bit,
+ }, {
+ .id = 0x05,
+ .type = SAA7164_UNIT_ANALOG_DEMODULATOR,
+ .name = "TDA8290-1",
+ .i2c_bus_nr = SAA7164_I2C_BUS_1,
+ .i2c_bus_addr = 0x84 >> 1,
+ .i2c_reg_len = REGLEN_8bit,
+ }, {
+ .id = 0x1b,
+ .type = SAA7164_UNIT_TUNER,
+ .name = "TDA18271-2",
+ .i2c_bus_nr = SAA7164_I2C_BUS_2,
+ .i2c_bus_addr = 0xc0 >> 1,
+ .i2c_reg_len = REGLEN_8bit,
+ }, {
+ .id = 0x1c,
+ .type = SAA7164_UNIT_ANALOG_DEMODULATOR,
+ .name = "TDA8290-2",
+ .i2c_bus_nr = SAA7164_I2C_BUS_2,
+ .i2c_bus_addr = 0x84 >> 1,
+ .i2c_reg_len = REGLEN_8bit,
+ }, {
+ .id = 0x1e,
+ .type = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+ .name = "TDA10048-1",
+ .i2c_bus_nr = SAA7164_I2C_BUS_1,
+ .i2c_bus_addr = 0x10 >> 1,
+ .i2c_reg_len = REGLEN_8bit,
+ }, {
+ .id = 0x1f,
+ .type = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+ .name = "TDA10048-2",
+ .i2c_bus_nr = SAA7164_I2C_BUS_2,
+ .i2c_bus_addr = 0x12 >> 1,
+ .i2c_reg_len = REGLEN_8bit,
+ } },
+ },
[SAA7164_BOARD_HAUPPAUGE_HVR2250] = {
.name = "Hauppauge WinTV-HVR2250",
.porta = SAA7164_MPEG_DVB,
@@ -426,6 +486,10 @@ struct saa7164_subid saa7164_subids[] =
.subvendor = 0x0070,
.subdevice = 0x8851,
.card = SAA7164_BOARD_HAUPPAUGE_HVR2250_2,
+ }, {
+ .subvendor = 0x0070,
+ .subdevice = 0x8940,
+ .card = SAA7164_BOARD_HAUPPAUGE_HVR2200_4,
},
};
const unsigned int saa7164_idcount = ARRAY_SIZE(saa7164_subids);
@@ -469,6 +533,7 @@ void saa7164_gpio_setup(struct saa7164_d
case SAA7164_BOARD_HAUPPAUGE_HVR2200:
case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
+ case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:
case SAA7164_BOARD_HAUPPAUGE_HVR2250:
case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:
case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:
@@ -549,6 +614,7 @@ void saa7164_card_setup(struct saa7164_d
case SAA7164_BOARD_HAUPPAUGE_HVR2200:
case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
+ case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:
case SAA7164_BOARD_HAUPPAUGE_HVR2250:
case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:
case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:
--- a/drivers/media/video/saa7164/saa7164-dvb.c
+++ b/drivers/media/video/saa7164/saa7164-dvb.c
@@ -475,6 +475,7 @@ int saa7164_dvb_register(struct saa7164_
case SAA7164_BOARD_HAUPPAUGE_HVR2200:
case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
+ case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:
i2c_bus = &dev->i2c_bus[port->nr + 1];
switch (port->nr) {
case 0:
--- a/drivers/media/video/saa7164/saa7164.h
+++ b/drivers/media/video/saa7164/saa7164.h
@@ -82,6 +82,7 @@
#define SAA7164_BOARD_HAUPPAUGE_HVR2200_3 6
#define SAA7164_BOARD_HAUPPAUGE_HVR2250_2 7
#define SAA7164_BOARD_HAUPPAUGE_HVR2250_3 8
+#define SAA7164_BOARD_HAUPPAUGE_HVR2200_4 9
#define SAA7164_MAX_UNITS 8
#define SAA7164_TS_NUMBER_OF_LINES 312
next prev parent reply other threads:[~2011-11-23 0:35 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 0:26 [00/53] 3.1.3-stable review Greg KH
2011-11-23 0:25 ` [01/53] genirq: Fix irqfixup, irqpoll regression Greg KH
2011-11-23 0:25 ` [02/53] ALSA: hda - Fix the connection selection of ADCs on Cirrus codecs Greg KH
2011-11-23 0:25 ` [03/53] [SCSI] fix WARNING: at drivers/scsi/scsi_lib.c:1704 Greg KH
2011-11-23 0:25 ` [04/53] [SCSI] hpsa: Disable ASPM Greg KH
2011-11-23 0:25 ` [05/53] [SCSI] aacraid: controller hangs if kernel uses non-default ASPM policy Greg KH
2011-11-23 0:25 ` Greg KH [this message]
2011-11-23 0:25 ` [07/53] KVM: s390: Fix RUNNING flag misinterpretation Greg KH
2011-11-23 0:25 ` [08/53] ARM: 7150/1: Allow kernel unaligned accesses on ARMv6+ Greg KH
2011-11-23 0:25 ` [09/53] Net, libertas: Resolve memory leak in if_spi_host_to_card() Greg KH
2011-11-23 0:25 ` [10/53] rt2x00: Fix sleep-while-atomic bug in powersaving code Greg KH
2011-11-23 0:25 ` [11/53] mac80211: fix NULL dereference in radiotap code Greg KH
2011-11-23 0:25 ` [12/53] mac80211: fix bug in ieee80211_build_probe_req Greg KH
2011-11-23 0:25 ` [13/53] nl80211: fix HT capability attribute validation Greg KH
2011-11-23 0:25 ` [14/53] cfg80211: fix bug on regulatory core exit on access to last_request Greg KH
2011-11-23 0:25 ` [15/53] ip6_tunnel: copy parms.name after register_netdevice Greg KH
2011-11-23 0:25 ` [16/53] PM / driver core: disable devices runtime PM during shutdown Greg KH
2011-11-23 0:25 ` [17/53] pch_phub: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23 0:25 ` [18/53] pch_phub: Fix MAC address writing issue for LAPIS ML7831 Greg KH
2011-11-23 0:25 ` [19/53] pch_uart: Fix hw-flow control issue Greg KH
2011-11-23 0:25 ` [20/53] pch_uart: Fix DMA resource leak issue Greg KH
2011-11-23 0:25 ` [21/53] pch_uart: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23 0:25 ` [22/53] tty: hvc_dcc: Fix duplicate character inputs Greg KH
2011-11-23 0:25 ` [23/53] TTY: ldisc, allow waiting for ldisc arbitrarily long Greg KH
2011-11-23 0:25 ` [24/53] TTY: ldisc, move wait idle to caller Greg KH
2011-11-23 0:25 ` [25/53] TTY: ldisc, wait for ldisc infinitely in hangup Greg KH
2011-11-23 0:25 ` [26/53] nfs: when attempting to open a directory, fall back on normal lookup (try #5) Greg KH
2011-11-23 0:25 ` [27/53] ALSA: hda - fix ELD memory leak Greg KH
2011-11-23 0:25 ` [28/53] pcie-gadget-spear: Add "platform:" prefix for platform modalias Greg KH
2011-11-23 0:25 ` [29/53] drivers/base/node.c: fix compilation error with older versions of gcc Greg KH
2011-11-23 0:25 ` [30/53] xhci: Set slot and ep0 flags for address command Greg KH
2011-11-23 0:25 ` [31/53] usb, xhci: Clear warm reset change event during init Greg KH
2011-11-23 0:25 ` [32/53] usb, xhci: fix lockdep warning on endpoint timeout Greg KH
2011-11-23 0:25 ` [33/53] USB: XHCI: resume root hubs when the controller resumes Greg KH
2011-11-23 0:25 ` [34/53] USB: option: release new PID for ZTE 3G modem Greg KH
2011-11-23 0:25 ` [35/53] USB: option: add PID of Huawei E173s " Greg KH
2011-11-23 0:25 ` [36/53] USB: serial: pl2303: rm duplicate id Greg KH
2011-11-23 0:25 ` [37/53] USB: pch_udc: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23 0:25 ` [38/53] USB: cdc-acm: Fix disconnect() vs close() race Greg KH
2011-11-23 0:25 ` [39/53] USB: workaround for bug in old version of GCC Greg KH
2011-11-23 0:25 ` [40/53] USB: ark3116 initialisation fix Greg KH
2011-11-23 0:25 ` [41/53] USB: Fix Corruption issue in USB ftdi driver ftdi_sio.c Greg KH
2011-11-23 0:25 ` [42/53] usb-storage: Accept 8020i-protocol commands longer than 12 bytes Greg KH
2011-11-23 0:25 ` [43/53] USB: EHCI: fix HUB TT scheduling issue with iso transfer Greg KH
2011-11-23 0:25 ` [44/53] USB: add quirk for Logitech C600 web cam Greg KH
2011-11-23 0:25 ` [45/53] USB: quirks: adding more quirky webcams to avoid squeaky audio Greg KH
2011-11-23 0:25 ` [46/53] drm/i915: fix IVB cursor support Greg KH
2011-11-23 0:25 ` [47/53] drm/i915: always set FDI composite sync bit Greg KH
2011-11-23 0:25 ` [48/53] batman-adv: fix tt_local_reset_flags() function Greg KH
2011-11-23 0:25 ` [49/53] batman-adv: correctly set the data field in the TT_REPONSE packet Greg KH
2011-11-23 0:25 ` [50/53] batman-adv: remove references for global tt entries Greg KH
2011-11-23 0:25 ` [51/53] batman-adv: add sanity check when removing global tts Greg KH
2011-11-23 0:25 ` [52/53] batman-adv: unify hash_entry field position in tt_local/global_entry Greg KH
2011-11-23 0:25 ` [53/53] vmscan: fix shrinker callback bug in fs/super.c Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111123002553.435914673@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=stable@vger.kernel.org \
--cc=stefan.bader@canonical.com \
--cc=stoth@kernellabs.com \
--cc=tony@hammertelecom.com.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®