aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'master'Jeff Garzik2006-02-07
|\
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvbLinus Torvalds2006-02-07
| |\
| | * Merge branch 'work-fixes'Mauro Carvalho Chehab2006-02-07
| | |\
| | | * V4L/DVB (3325): Disabled debug on by default in tvp5150Markus Rechberger2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled debug on by default in tvp5150 Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3318e): DVB: remove the at76c651/tda80xx frontendsAdrian Bunk2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The at76c651 and tda80xx frontends are currently completely unused, IOW their only effect is making the kernel larger for people accitentially enabling them. The current in-kernel drivers differ from the drivers at cvs.tuxbox.org, and re-adding them when parts of the dbox2 project get merged should be trivial. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3318c): fix saa7146 kobject register failureDave Jones2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whoops. kobject_register failed for hexium HV-PCI6/Orion (-13) [<c01d3eb6>] kobject_register+0x31/0x47 [<c023a996>] bus_add_driver+0x4a/0xfd [<c01de3c1>] __pci_register_driver+0x82/0xa4 [<d083400a>] hexium_init_module+0xa/0x47 [hexium_orion] [<c013bdae>] sys_init_module+0x167b/0x1822 [<c01633f7>] do_sync_read+0xb8/0xf3 [<c0133fa3>] autoremove_wake_function+0x0/0x2d [<c0145390>] audit_syscall_entry+0x118/0x13f [<c0106ae2>] do_syscall_trace+0x104/0x14a [<c0103d21>] syscall_call+0x7/0xb slashes in kobject names aren't allowed. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3318a): Makes Some symbols static.Mauro Carvalho Chehab2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | Some symbols at cx88-alsa were global. Making those static. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3313): FIX: Check if FW was downloaded or not + new firmware filePatrick Boettcher2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When a firmware was downloaded dvb_usb_device_init returns NULL for the dvb_usb_device, then nothing should be done with that pointer and device, because it will re-enumerate. - A new firmware should be used with digitv devices. - It should make "slave"-devices work and others, too. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3312): FIX: Multiple usage of VP7045-based devicesPatrick Boettcher2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reassigning function pointers in a static led to infinite loops when using multiple VP7045-based device at the same time on one system. Using kmalloc'd copies for reassignments is better. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3310): Use MT352 parallel transport function for all Bluebird ↵Michael Krufky2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FusionHDTV DVB-T boxes. Use the parallel transport function of the MT352 demodulator in TH7579 and LGZ201 -based FusionHDTV Bluebird usb boxes. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3308): Use parallel transport for FusionHDTV Dual Digital USBChris Pascoe2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the parallel transport function of the MT352 in USB demodulator of the Dual Digital board. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3307): Support for Galaxis DVB-S rev1.3Oliver Endriss2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | support for Galaxis DVB-S rev1.3 (subsystem 13c2:0004) Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3306): Fixed i2c return value, conversion mdelay to msleepMarkus Rechberger2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed i2c return value, conversion mdelay to msleep Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3300): Add standard for South Korean NTSC-M using A2 audio.Hans Verkuil2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | South Korea uses NTSC-M but with A2 audio instead of BTSC. Several audio chips need this information in order to set the correct audio processing registers. Acked-by: Mauro Carvalho Chehab <mauro_chehab@yahoo.com.br> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3297): Add IR support to KWorld DVB-T (cx22702-based)Marco Manenti2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add IR support to KWorld DVB-T (cx22702-based) Signed-off-by: Marco Manenti <marco_manenti@colman.it> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3294): Fix [Bug 5895] to correct snd_87x autodetectManu Abraham2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With DVB drivers enabled snd_87x (ALSA) don't detect. Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3281): Added signal detection support to tvp5150Markus Rechberger2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - added signal detection support to tvp5150 Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3266): Fix NICAM buzz on analog soundMarcin Rudowski2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, having the number of lines fixed at 4 reduces (or even kills) the buzz found in NICAM stereo with analog sound. Signed-off-by: Marcin Rudowski <mar_rud@poczta.onet.pl> Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | | * V4L/DVB (3299): Kconfig: DVB_USB_CXUSB depends on DVB_LGDT330X and DVB_MT352Michael Krufky2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rename DVB_USB_CXUSB one-liner description to: Conexant USB2.0 hybrid reference design support. - with the addition of bluebird support to dvb-usb-cxusb, it now depends on lgdt330x and mt352 modules. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | Merge branch 'origin'Mauro Carvalho Chehab2006-02-07
| | |\ \
| | * \ \ Merge branch 'origin'Mauro Carvalho Chehab2006-02-06
| | |\ \ \
| | * \ \ \ Merge branch 'origin'Mauro Carvalho Chehab2006-02-06
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'origin'Mauro Carvalho Chehab2006-01-31
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | V4L/DVB (3453a): Alters MAINTAINERS file to point to newer v4l-dvb emailMauro Carvalho Chehab2006-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - V4L/DVB Maintainers list changed. This patch alters the email to the new address. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Acked-By: Johannes Stezenbach <js@linuxtv.org>
| | * | | | | V4L/DVB (3442): Allow tristate build for cx88-vp3054-i2cMichael Krufky2006-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allow tristate build for cx88-vp3054-i2c Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3439a): media video stradis memory fixJiri Slaby2006-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memset clears once set structure, there is actually no need for memset, because configure function do it for us. Next, vfree(NULL) is legal, so avoid useless labels. Thanks Dave Jones for reporting this. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3434): changed comment in tuner-core.cMarkus Rechberger2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - changed comment in tuner-core.c Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3433): Fix printk type warningRandy Dunlap2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix printk type warning: drivers/media/dvb/b2c2/flexcop-pci.c:164: warning: format '%08x' expects type 'unsigned int', but argument 4 has type 'dma_addr_t' Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3431): fixed spelling error, exectuted --> executed.Michael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed spelling error, exectuted --> executed. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3429): Missing break statement on tuner-coreMarkus Rechberger2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - default_tuner_init was called twice due to a missing break statement. Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Acked-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3428): drivers/media/dvb/ possible cleanupsAdrian Bunk2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make needlessly global code static - #if 0 the following unused global functions: - b2c2/flexcop-dma.c: flexcop_dma_control_packet_irq() - b2c2/flexcop-dma.c: flexcop_dma_config_packet_count() Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3418): Cause tda9887 to use I2C_DRIVERID_TDA9887Mike Isely2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The tda9887 has an I2C id reserved for it, but it hasn't been using it. Probably an oversight. Fixed with this patch. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3417): make VP-3054 Secondary I2C Bus Support a Kconfig option.Michael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make VP-3054 Secondary I2C Bus Support a Kconfig option. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3416): Recognise Hauppauge card #34519Ian Pickworth2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Recognise Hauppauge card #34519 Signed-off-by: Ian Pickworth <ian@pickworth.me.uk> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3414): rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmvMichael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmv Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3413): Kill nxt2002 in favor of the nxt200x moduleMichael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Kill nxt2002 module in favor of nxt200x. - Repair broken nxt2002 support in the nxt200x module. - Make the flexcop driver use nxt200x instead of the nxt2002 module for the Air2PC 2nd generation PCI card. - Remove the nxt2002 module from cvs and kernel build. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3409): Mark Typhoon cards as Lifeview OEM'sPeter Missel2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mark Typhoon cards as OEM of Lifeview. Signed-off-by: Peter Missel <peter.missel@onlinehome.de> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3405): Fixes tvp5150a/am1 detection.Mauro Carvalho Chehab2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tvp5150 type were determined by a secondary register instead of using ROM code. - tvp5150am1 have ROM=4.0, while tvp5150a have ROM=3.33 (decimal). All other ROM versions are reported as unknown tvp5150. - Except for reporting, current code doesn't enable any special feature for tvp5150am1 or tvp5150a. Code should work for both models (but were tested only for tvp5150am1). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | VIDEO_CX88_ALSA must select SND_PCMAdrian Bunk2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - VIDEO_CX88_ALSA must select SND_PCM Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3403): Add probe check for the tda9840.Hans Verkuil2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add probe check for the tda9840 to prevent misdetection of a Micronas dpl3518a as a tda9840. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3392): Add PCI ID for DigitalNow DVB-T Dual, rebranded DViCO ↵Michael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FusionHDTV DVB-T Dual. - Add PCI ID for DigitalNow DVB-T Dual, rebranded DViCO FusionHDTV DVB-T Dual. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | | | | V4L/DVB (3406): Added credits for em28xx-video.cMauro Carvalho Chehab2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added credits for sn9c102 kernel module and his author as some parts of em28xx-video were based. Acked-by: Luca Risolia <luca.risolia@studio.unibo.it> Acked-by: Markus Rechberger <mrechberger@gmail.com> Acked-by: Ludovico Cavedon <cavedon@sssup.it> Acked-by: Sascha Sommer <saschasommer@freenet.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | | | | [PATCH] cciss: softirq handler needs to save interrupt flagsJens Axboe2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The softirq rq completion handler needs to save/restore interrupt flags appropriately. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | | | | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2006-02-07
| |\ \ \ \ \ \
| | * | | | | | [MIPS] Clear ST0_RE on bootup.Ralf Baechle2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reset state is undefined and some firmware doesn't clear this bit possibly resulting in crashes on entry into userland. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | | | | [MIPS] TX49x7: Fix reporting of the CPU name and PCI clockSergei Shtylylov2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've noticed that PCI clock was incorrectly reported as 66 MHz while being mere 33 MHz on RBTX4937 board -- this was due to the different encoding of the PCI divisor field in CCFG register between TX4927 and TX4937 chips... Also, RBTX49x7 was printed out as a CPU name (e.g., "CPU is RBTX4937"); and some debug printk() were duplicating each other... Signed-off-by: Konstantin Baydarov <kbaidarov@ru.mvista.com> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | | | | [MIPS] TX49 MFC0 bug workaroundAtsushi Nemoto2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If mfc0 $12 follows store and the mfc0 is last instruction of a page and fetching the next instruction causes TLB miss, the result of the mfc0 might wrongly contain EXL bit. ERT-TX49H2-027, ERT-TX49H3-012, ERT-TX49HL3-006, ERT-TX49H4-008 Workaround: mask EXL bit of the result or place a nop before mfc0. It doesn't harm to always clear those bits, so we change the code to do so. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | | | | [MIPS] Fix linker script to work for non-4K page size.Ralf Baechle2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very much to my surprise Fuxin Zhang reports this is all it takes to get the kernel to work for page sizes larger than 4kB. This also paves the way for support for the R6000 and R8000 which don't support 4kB page size. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | | | | [MIPS] Oprofile: Support for 34K UP kernels.Ralf Baechle2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | | | | [MIPS] Fix dump_tlb.c warning and cleanup.Atsushi Nemoto2006-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 19:37:33 -0400