V4L/DVB (13597): bttv: add i2c addr for old WinTV card to IR probe list
authorJarod Wilson <jarod@redhat.com>
Thu, 10 Dec 2009 19:46:06 +0000 (16:46 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 16 Dec 2009 02:18:33 +0000 (00:18 -0200)
There are old bttv-driven Hauppauge WinTV series cards that have
their IR part at i2c addr 0x71, which doesn't get considered in the
new 2.6.31 i2c code.

From a 2.6.29 kernel:

lirc_i2c: chip 0x10005 found @ 0x71 (Hauppauge PVR150)

Minor cosmetic glitch, the card in question isn't actually a PVR-150, its:

03:06.0 Multimedia video controller: Brooktree Corporation Bt878 Video Capture (rev 11)
Subsystem: Hauppauge computer works Inc. WinTV Series
Flags: bus master, medium devsel, latency 32, IRQ 19
Memory at f4ffe000 (32-bit, prefetchable) [size=4K]
Capabilities: [44] Vital Product Data
Capabilities: [4c] Power Management version 2
Kernel driver in use: bttv
Kernel modules: bttv

Device ID: 0x109e:0x036e, Sub-Device ID: 0x0070:0x13eb

This simply adds 0x71 to the list of addresses i2c_new_probed_device should
consider, which gets IR working on this card again.

Reported-by: Adam Williamson <awilliam@redhat.com>
Tested-by: Adam Williamson <awilliam@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/bt8xx/bttv-i2c.c

index beda363418b0e6f28c5bc1ed1342ef16a9676817..a9d9ee73b25a06410d09a8798e78e7e4a9699da9 100644 (file)
@@ -400,7 +400,7 @@ int __devinit init_bttv_i2c(struct bttv *btv)
                   That's why we probe 0x1a (~0x34) first. CB
                */
                const unsigned short addr_list[] = {
-                       0x1a, 0x18, 0x4b, 0x64, 0x30,
+                       0x1a, 0x18, 0x4b, 0x64, 0x30, 0x71,
                        I2C_CLIENT_END
                };