Martin Samuelsson [Thu, 27 Apr 2006 13:17:00 +0000 (10:17 -0300)]
V4L/DVB (3916): AverMedia 6 Eyes AVS6EYES support
Add support for the AverMedia 6 Eyes MJPEG card.
- Updated drivers/media/video/Kconfig with AVS6EYES
options.
- Added CONFIG_VIDEO_ZORAN_AVS6EYES to
drivers/media/video/Makefile.
- Added I2C_DRIVERID_BT866 and I2C_DRIVERID_KS0127 to
include/linux/i2c-id.h
- Added drivers/media/video/ks0127.c, imported and modified from
the Marvel project.
- Added drivers/media/video/ks0127.h, imported and modified from
the Marvel project.
- Added drivers/media/video/bt866.c, ported from a 2.4 version
by Christer Weinigel.
- Added AVS6EYES to drivers/media/video/zoran_card.c
- Added input_mux to all cards in drivers/media/video/zoran_card.c
- Added input mux module parameter to drivers/media/video/zoran_card.c
- Added AVS6EYES to card_type in drivers/media/video/zoran.h
- Added input_mux to card_info in drivers/media/video/zoran.h
- Upped BUZ_MAX_INPUT in drivers/media/video/zoran.h from 8 to 16,
as the AVS6EYES has 10.
- Updated Documentation/video4linux/Zoran with information about AVS6EYES.
Signed-off-by: Martin Samuelsson <sam@home.se>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Luca Risolia [Wed, 26 Apr 2006 13:19:49 +0000 (10:19 -0300)]
V4L/DVB (3906): ZC0301 driver updates
This is a patch fixing a small bug in zc0301_start_transfer()
introduced in the ZC0301 driver v1.04.
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 25 Apr 2006 02:21:46 +0000 (23:21 -0300)]
V4L/DVB (3900): Rename fe_lgh06xf.h to lg_h06xf.h
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 25 Apr 2006 08:36:19 +0000 (05:36 -0300)]
V4L/DVB (3898): Fix dvb-usb tuner code
I had forgotten to rename some of the tuner functions in the refactoring.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Wed, 19 Apr 2006 00:37:20 +0000 (21:37 -0300)]
V4L/DVB (3892): Trim documentation
Trim excess documentation down to the essentials.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:56:10 +0000 (17:56 -0300)]
V4L/DVB (3891): Convert cx88-dvb to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Attach dvb-pll where possible.
Add pll gate control calls where appropriate.
Sort out the hybrid cards to work with the revamped mt352/sl10353 demods
supporting external tuners.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:12 +0000 (17:47 -0300)]
V4L/DVB (3890): Add support for non-attached tuners to zl10353
Add no_tuner setting like in mt352.
Update to use correct tuner API calls.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:12 +0000 (17:47 -0300)]
V4L/DVB (3889): Sort out support for non-attached tuners on mt352
Make it use set_params/pllbuf as appropriate so it works with
dvb_pll_attach()ed tuners.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:12 +0000 (17:47 -0300)]
V4L/DVB (3887): Convert bt8xx to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Attach dvb-pll where possible.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:12 +0000 (17:47 -0300)]
V4L/DVB (3885): Convert dvb-pll to be a refactored tuner
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Remove BUG_ON() and convert to a soft error.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:12 +0000 (17:47 -0300)]
V4L/DVB (3884): Convert dibusb* to refactored tuner code
Hook tuner call into tuner_ops.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:12 +0000 (17:47 -0300)]
V4L/DVB (3883): Convert digtv to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3882): Convert dvb-usb/umt-010 to refactored tuner code
Hook tuner call into tuner_ops.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3881): Convert core dvb-usb pll code to refactored tuner code
Rename pll calls to appropriate tuner calls.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3880): Convert dvb-ttusb-budget to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3879): Convert saa7134-dvb to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Attach dvb-pll where possible.
Add pll gate control calls where appropriate.
Move europa specific code from tda1104x into card driver using ops overrides
(this is how it should ebe done instead of hacking card specific code into
the demod driver).
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3878): Convert ttpci/budget-patch to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3877): Convert ttpci/budget-av to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3876): Convert ttpci/budget-ci to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3875): Convert ttpci/budget to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3874): Convert ttpci/av7110 to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Add pll gate control calls where appropriate.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3873): Convert pluto2 to refactored tuner code
Rename pll calls to appropriate tuner calls.
Remove pll functions from demod structures.
Hook tuner call into tuner_ops.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3872): Convert bsbe1/bsru6 to refactored tuner code
Convert to tuner_ops call API.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3871): Convert lgdt330x to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3870): Convert dib3000* to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3869): Convert cx24123 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3868): Convert zl10353 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Use standardised pllbuf call.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:11 +0000 (17:47 -0300)]
V4L/DVB (3867): Convert nxt6000 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3866): Convert nxt200x to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Standardise the calls used to retrieve tuner data.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3865): Convert or51132 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove dvb-pll code - done elsewhere now.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3864): Convert dvb_dummy_fe to refactored tuner code
Make it call the tuner calls - in case someone wants to use it to develop a
tuner without a demod.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3863): Convert cx24110 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Remove unneeded sleep function completely.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3862): Convert tda10021 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3861): Convert mt352 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointer from structure.
Use standardised pllbuf function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3860): Convert l64871 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3859): Convert s5h1420 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3858): Convert tda1004x to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Remove europa specific hack (moved into appropriate card driver)
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3857): Convert sp8870 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3856): Convert sp887x to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3855): Convert stv0299 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Remove extra exported function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3854): Convert ves1x93 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:10 +0000 (17:47 -0300)]
V4L/DVB (3853): Convert ves1820 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:09 +0000 (17:47 -0300)]
V4L/DVB (3851): Convert tda8083 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:09 +0000 (17:47 -0300)]
V4L/DVB (3850): Convert stv0297 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Remove extra exported pll gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:09 +0000 (17:47 -0300)]
V4L/DVB (3849): Convert mt312 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:09 +0000 (17:47 -0300)]
V4L/DVB (3848): Convert cx22702 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Remove dvb-pll support - done elsewhere now.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:09 +0000 (17:47 -0300)]
V4L/DVB (3847): Convert cx22700 to refactored tuner code
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Tue, 18 Apr 2006 20:47:09 +0000 (17:47 -0300)]
V4L/DVB (3845): DVB core changes for PLL refactoring
Add tuner_ops structure.
Add calls into dvb_frontend to support the new tuner architecture.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 18 Apr 2006 20:47:08 +0000 (17:47 -0300)]
V4L/DVB (3844): B2c2-flexcop: use fe_lgh06xf.h
- removed duplicated tuning code for LG TDVS H061F
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 18 Apr 2006 20:47:08 +0000 (17:47 -0300)]
V4L/DVB (3843): Cxusb: use fe_lgh06xf.h
- removed duplicated tuning code for LG TDVS H064F
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 18 Apr 2006 20:47:08 +0000 (17:47 -0300)]
V4L/DVB (3842): Cx88-dvb: use fe_lgh06xf.h
- removed duplicated tuning code for LG TDVS H062F/H064F
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 18 Apr 2006 20:47:08 +0000 (17:47 -0300)]
V4L/DVB (3841): Dvb-bt8xx: use fe_lgh06xf.h
- removed duplicated tuning code for LG TDVS H064F
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 18 Apr 2006 20:47:08 +0000 (17:47 -0300)]
V4L/DVB (3840): Create standalone fe_lgh064f header
move all pll_set functions for lg-tdvs-h06xf atsc tuners to a standalone header
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Luca Risolia [Mon, 24 Apr 2006 14:28:23 +0000 (11:28 -0300)]
V4L/DVB (3838): ZC0301 driver updates
ZC0301 driver updates:
- Add support for PB-0330 image sensor
- Generic documentation cleanups and updates
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Luc Saillard [Mon, 24 Apr 2006 13:29:46 +0000 (10:29 -0300)]
V4L/DVB (3835): [PATCH] update pwc driver
Add v4l2 compatibility
Include the decompressor (legal problem has been resolv by Alan Cox)
Faster decoder and easier to maintain, optimize, ...
Can export to userland compressed stream
Support more cameras, lot of bugs are fixed.
Signed-off-by: Luc Saillard <luc@saillard.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 22 Apr 2006 19:15:11 +0000 (16:15 -0300)]
V4L/DVB (3830): Fix display name for LG TDVS-H06xF
This patch fixes the display name for LG TDVS-H06xF tuners
in both tuner and dvb-pll modules.
Changing the names of the actual pll_desc struct and tuner definitions
has been held back until after the dvb tuner refactoring gets merged.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Valentin Zagura [Fri, 21 Apr 2006 01:56:25 +0000 (22:56 -0300)]
V4L/DVB (3827): Cx88-blackbird: clean up the buffers when closing the MPEG stream
This patch cleans up the buffer queue when the MPEG stream is closed,
preventing the message, 'cx8802_timeout'
Signed-off-by: Valentin Zagura <puthre@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Adrian Bunk [Wed, 19 Apr 2006 23:49:28 +0000 (20:49 -0300)]
V4L/DVB (3820): Drivers/media/dvb/dvb-usb/: possible cleanups
- make the following needlessly global struct static:
dvb-usb/cxusb.c: cxusb_mt352_config
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 18 Apr 2006 03:22:09 +0000 (00:22 -0300)]
V4L/DVB (3817): KWorld HardwareMpegTV XPert: set encoder video standard based on tvnorm
The KWorld HardwareMpegTV XPert uses a multistandard tuner, tda8290 + tda8275.
Without checking the video standard in blackbird_probe, the encoder defaults
to PAL, even if the incoming video stream is NTSC. This patch checks the video
standard set by the cx2388x decoder, and sets the encoding height and frame
accordingly.
This patch is designed to only affect the KWorld HardwareMpegTV XPert.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Wed, 19 Apr 2006 21:50:35 +0000 (18:50 -0300)]
V4L/DVB (3814): Add support for Samsung TCPG 6121P30A PAL tuner.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 16 Apr 2006 16:19:24 +0000 (13:19 -0300)]
V4L/DVB (3811): Cxusb: lgh064f: set auxiliary byte in pll_set
This changeset removes pll_init, and instead sets the tuner
auxiliary byte in pll_set.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 16 Apr 2006 15:17:34 +0000 (12:17 -0300)]
V4L/DVB (3810): KWorld HardwareMpegTV XPert: Enable Blackbird MPEG encoder support
- clear I2SIN to deliver the audio stream to the cx23416 mpeg encoder.
- enable blackbird support on the KWorld HardwareMpegTV XPert
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew Morton [Thu, 27 Apr 2006 15:01:18 +0000 (12:01 -0300)]
V4L/DVB (3809a): Remove compat stuff for DMX_GET_EVENT
The ioctl were removed by:
V4L/DVB (3727): Remove DMX_GET_EVENT and associated data structures
due to the ioctl DMX_GET_EVENT has never been implemented, and also
scrambling events can't be generated in a useful way by the hardware.
This patch removes the corresponding entry at fs/compat_ioctl.c
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 13 Apr 2006 21:43:50 +0000 (18:43 -0300)]
V4L/DVB (3807): Cx88-blackbird: fix typo
BLACKBIRD_FIELD1_SAA7115 was repeated. Corrected version reads:
blackbird_api_cmd(dev, BLACKBIRD_API_SET_CAPTURE_LINES, 2, 0,
BLACKBIRD_FIELD1_SAA7115,
BLACKBIRD_FIELD2_SAA7115
)
Thanks-to: Valentin Zagura <puthre@gmail.com> for pointing this out.
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 13 Apr 2006 20:41:52 +0000 (17:41 -0300)]
V4L/DVB (3806): Cx88-blackbird: allow proper detection of PAL vs. NTSC video standard
- removed test for CX88_BOARD_HAUPPAUGE_ROSLYN prior to determining whether
the video standard in use is NTSC or PAL.
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Thu, 13 Apr 2006 20:29:07 +0000 (17:29 -0300)]
V4L/DVB (3805): Fix KNC1 card frontend detection
Since I reordered the CI/frontend detection, it turns out the frontend needs
to have a GPIO set to power it on; otherwise frontend init fails.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 13 Apr 2006 16:06:28 +0000 (13:06 -0300)]
V4L/DVB (3801): Cx88-tvaudio: replace 'if' with 'switch..case'
This patch cleans up a potential mess that has yet to occur in the
card-specific part of cx88-tvaudio.c that sets sound input from external adc.
It may be a good idea to move this setting into cx88-cards.c in the future.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Valentin Zagura [Thu, 13 Apr 2006 15:41:43 +0000 (12:41 -0300)]
V4L/DVB (3800): Cx88: added support for KWorld MCE 200 Deluxe
This patch adds support for KWorld MCE 200 Deluxe.
Raw video is working perfectly, MPEG capture using
cx88-blackbird is also working, but the quality
could be improved.
svideo and radio until they can be tested also.
Signed-off-by: Valentin Zagura <puthre@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Trent Piepho [Sun, 9 Apr 2006 21:48:04 +0000 (18:48 -0300)]
V4L/DVB (3757): Fix alignment after the replacement from semaphore to muxex
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Adrian Bunk [Tue, 11 Apr 2006 13:26:57 +0000 (10:26 -0300)]
V4L/DVB (3770): Kill drivers/media/common/saa7146_vv_ksyms.c
This patch moves the EXPORT_SYMBOL's from
drivers/media/common/saa7146_vv_ksyms.c to the files with the actual
functions.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Uwe Bugla [Tue, 11 Apr 2006 13:21:37 +0000 (10:21 -0300)]
V4L/DVB (3769): Fix a type error in dvb_frontend.c
Signed-off-by: Uwe Bugla <uwe.bugla@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Uwe Bugla [Tue, 11 Apr 2006 13:20:34 +0000 (10:20 -0300)]
V4L/DVB (3768): Fix a tab error in cx14110.c, dprintk
Signed-off-by: Uwe Bugla <uwe.bugla@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 11 Apr 2006 04:46:46 +0000 (01:46 -0300)]
V4L/DVB (3765): Dvb-bt8xx: add support for DViCO FusionHDTV DVB-T Lite 2nd revision
This patch adds support for the new revision of the DViCO
FusionHDTV DVB-T Lite, based on the zl10353 demod instead
of mt352.
Both mt352 and zl10353 revisions of this card have the
same PCI subsystem ID.
Acked-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Ack'd-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Mon, 10 Apr 2006 12:40:40 +0000 (09:40 -0300)]
V4L/DVB (3764): Lgdt330x: update supported cards list in comments
- pcHDTV HD5500 ATSC/QAM uses LG DT3303
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Mon, 10 Apr 2006 12:27:37 +0000 (09:27 -0300)]
V4L/DVB (3762): Add sysfs device links to dvb devices
Currently in /sys/class/dvb/dvbX.demuxY/ we have:
dev
uevent
With the patch, we have (for a PCI DVB device):
dev
device -> ../../../devices/pci0000:00/0000:00:1e.0/0000:03:0d.0
uevent
So userspace tools can (finally) work out which physical device a DVB adapter
refers to. Previously you had to kinda look through dmesg and hope that it
hadn't been dumped out of the buffer. This makes debugging a lot easier if
the system has been up for a long time!
This is done by adding an extra 'struct device *' parameter to
dvb_register_adapter(). It will work with any kind of standard
linux 'device'. Additionally, if someone has an embedded system which does
things differently, they can simply supply 'NULL' and the behaviour will be
as before - the link will simply not appear.
Ack'd-by: Manu Abraham <manu@linuxtv.org>
Acked-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Trent Piepho [Mon, 10 Apr 2006 12:27:08 +0000 (09:27 -0300)]
V4L/DVB (3761): Silence some dprintk's in cx88-mpeg
Changeset
395c7c4d8f0c changed several dprintks from level 1 to level 0
(always on). They generate four lines every time DMA starts, which don't
containing any information with a use outside of debugging. This turns them
back to level 1.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Sat, 8 Apr 2006 19:06:16 +0000 (16:06 -0300)]
V4L/DVB (3753): Whitespace cleanups at media/radio
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey [Thu, 6 Apr 2006 13:37:56 +0000 (10:37 -0300)]
V4L/DVB (3741): Budget-core doesn't check if register adapter fails
If you have more than DVB_MAX_ADAPTERS in your machine, this causes an oops.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Trent Piepho [Thu, 6 Apr 2006 09:03:09 +0000 (06:03 -0300)]
V4L/DVB (3739): Add support for FE_GET_FRONTEND to or51132 frontend
Adds the FE_GET_FRONTEND ioctl to the or51132 frontend. Current modulation is
read from the hardware, while frequency is taken from the driver's state.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Fri, 7 Apr 2006 06:24:54 +0000 (03:24 -0300)]
V4L/DVB (3736): Cx88 cleanup: move CX88_BOARD_PCHDTV_HD5500 to the end of the cards array
- new cards should always be added to the end of the list.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Rusty Scott [Fri, 7 Apr 2006 05:21:31 +0000 (02:21 -0300)]
V4L/DVB (3735): Add support for pcHDTV HD5500 ATSC/QAM
Added card definitions for the pcHDTV HD5500 ATSC/QAM card
Signed-off-by: Rusty Scott <rustys@ieee.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andreas Oberritter [Wed, 5 Apr 2006 19:36:51 +0000 (16:36 -0300)]
V4L/DVB (3727): Remove DMX_GET_EVENT and associated data structures
The ioctl DMX_GET_EVENT has never been implemented.
I guess no software is using it because of its lack of implementation.
Future software won't use it, too, because this API doesn't make much
sense the way it is: Frontend events have their own different API.
Scrambling events can't be generated in a useful way by the hardware I
know of.
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Trent Piepho [Tue, 4 Apr 2006 12:30:33 +0000 (09:30 -0300)]
V4L/DVB (3724): Remove a wee bit of cruft
A few lines that do nothing in the or51132 frontend, removed.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Trent Piepho [Tue, 4 Apr 2006 12:30:29 +0000 (09:30 -0300)]
V4L/DVB (3723): Avoid unnecessary firmware re-loads in or51132 frontend
As QAM_64, QAM_256, and QAM_AUTO all use the same firmware, switching
between these modulations doesn't require a firmware re-load. This also
fixes a mishandled error condition, in which the firmware file is loaded
into the kernel, the clock mode is changed, but then the firmware upload
to the device fails. The modulation change is aborted, but the clock
mode would still be changed.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Trent Piepho [Tue, 4 Apr 2006 04:56:30 +0000 (01:56 -0300)]
V4L/DVB (3721): Fix spelling
It's "Terrestrial"
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Mon, 3 Apr 2006 04:29:09 +0000 (01:29 -0300)]
V4L/DVB (3720): Fix spelling error / typo in comments
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 2 Apr 2006 22:11:10 +0000 (19:11 -0300)]
V4L/DVB (3718): Removed trailing newlines
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Mon, 3 Apr 2006 10:53:40 +0000 (07:53 -0300)]
V4L/DVB (3715): Change all emails to the currently used one.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Sun, 2 Apr 2006 16:35:00 +0000 (13:35 -0300)]
V4L/DVB (3712): Fix video input setting of em28xx, use _INT_S_VIDEO_ROUTING in tvp5150
- Use new routing input defines in em28xx-cards.c
- Fix S-Video settings for tvp5150-based cards (input was copied from saa7115
based cards and worked only because S-Video was selected in the default: case)
- Replace VIDIOC_S_INPUT by VIDIOC_INT_S_VIDEO_ROUTING in em28xx-video.c
- Remove the now obsolete VIDIOC_S_INPUT handler in saa7115.c
- Add VIDIOC_INT_G/S_VIDEO_ROUTING in tvp5150.c
- Add new media/tvp5150.h with the routing defines.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Sun, 2 Apr 2006 15:50:42 +0000 (12:50 -0300)]
V4L/DVB (3711): Add support for VIDIOC_INT_S_CRYSTAL_FREQ internal command.
Some saa7115-based cards use a different crystal frequency and a different
audio clock generation. Add a new VIDIOC_INT_S_CRYSTAL_FREQ command to be
able to set these values.
Also change the default APLL setting to 0. It makes no sense to have the
audio clock independent from the video clock, this can lead to audio/video
synchronization problems. Setting this to 0 is also consistent with the old
saa7114.c source and the way the Hauppauge Windows driver sets it.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Sun, 2 Apr 2006 11:21:02 +0000 (08:21 -0300)]
V4L/DVB (3709): Improve line-in handling
- improve handling of the EXTERN input: don't start an unnecessary carrier scan
- improve the LOG_STATUS output
- ensure that a carrier scan is started again when switching back to the tuner.
- set correct prescale for L-NICAM
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Trent Piepho [Sun, 2 Apr 2006 23:40:33 +0000 (20:40 -0300)]
V4L/DVB (3708a): Clean up some cruft in or51132 frontend
There is some old code in the or51133 firmware loading function that
has no effect. Left a comment to in case it helps someone trying
to reverse engineer the chip.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Linus Torvalds [Sun, 25 Jun 2006 00:48:14 +0000 (17:48 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits)
[ARM] 3648/1: Update struct ucontext layout for coprocessor registers
[ARM] Add identifying number for non-rt sigframe
[ARM] Gather common sigframe saving code into setup_sigframe()
[ARM] Gather common sigframe restoration code into restore_sigframe()
[ARM] Re-use sigframe within rt_sigframe
[ARM] Merge sigcontext and sigmask members of sigframe
[ARM] Replace extramask with a full copy of the sigmask
[ARM] Remove rt_sigframe puc and pinfo pointers
[ARM] 3647/1: S3C24XX: add Osiris to the list of simtec pm machines
[ARM] 3645/1: S3C2412: irq support for external interrupts
[ARM] 3643/1: S3C2410: Add new usb clocks
[ARM] 3642/1: S3C24XX: Add machine SMDK2413
[ARM] 3641/1: S3C2412: Fixup gpio register naming
[ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON
[ARM] 3639/1: S3C2412: serial port support
[ARM] 3638/1: S3C2412: core clocks
[ARM] 3637/1: S3C24XX: Add mpll clock, and set as fclk parent
[ARM] 3636/1: S3C2412: Add selection of CPU_ARM926
[ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support
[ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos
...
Linus Torvalds [Sun, 25 Jun 2006 00:47:09 +0000 (17:47 -0700)]
Revert "[PATCH] usb: drivers/usb/core/devio.c dereferences a userspace pointer"
This reverts commit
786dc1d3d7333f269e17d742886eac2188a2d9cc.
As Al so eloquently points out, the patch is crap. The old code was fine,
the new code was bogus.
It never dereferenced a user pointer, the "->" operator was to an array
member, which gives the _address_ of the member (in user space), not an
actual dereference at all.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Russell King [Sat, 24 Jun 2006 22:53:01 +0000 (23:53 +0100)]
Merge signal handler branch
Daniel Jacobowitz [Sat, 24 Jun 2006 22:46:21 +0000 (23:46 +0100)]
[ARM] 3648/1: Update struct ucontext layout for coprocessor registers
Patch from Daniel Jacobowitz
In order for userspace to find saved coprocessor registers, move them from
struct rt_sigframe into struct ucontext. Also allow space for glibc's
sigset_t, so that userspace and kernelspace can use the same ucontext
layout. Define the magic numbers for iWMMXt in the header file for easier
reference. Include the size of the coprocessor data in the magic numbers.
Also define magic numbers and layout for VFP, not yet saved.
Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Torvalds [Sat, 24 Jun 2006 21:48:43 +0000 (14:48 -0700)]
Merge branch 'drm-patches' of git://git./linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: radeon constify radeon microcode
Add i915 ioctls to configure pipes for vblank interrupt.
drm: update radeon to 1.25 add r200 vertex program support
drm: radeon add a tcl state flush before accessing tcl vector space
Linus Torvalds [Sat, 24 Jun 2006 21:48:35 +0000 (14:48 -0700)]
Merge branch 'intelfb-patches' of git://git./linux/kernel/git/airlied/intelfb-2.6
* 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
intelfb delousing
Linus Torvalds [Sat, 24 Jun 2006 21:48:24 +0000 (14:48 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (40 commits)
[SPARC64]: Update defconfig.
[SPARC64]: Make auxio a real driver.
[PARPORT] sunbpp: Convert to new SBUS device framework.
[Documentation]: Update probing info in sbus_drivers.txt
[SCSI] qlogicpti: Convert to new SBUS device framework.
[SCSI] esp: Fix bug in esp_remove_common.
[NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().
[NET] myri_sbus: Kill unused next_module struct member.
[NET] myri_sbus: Convert to new SBUS device layer.
[NET] sunqe: Convert to new SBUS driver layer.
[NET] sunbmac: Convert over to new SBUS device framework.
[NET] sunlance: Convert to new SBUS driver framework.
[NET] sunhme: Convert to new SBUS driver framework.
[NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs.
[SCSI] sparc: Port esp to new SBUS driver layer.
[SOUND] sparc: Port amd7930 to new SBUS device layer.
[SBUS]: Rewrite and plug into of_device framework.
[SPARC]: Port of_device layer and make ebus use it.
[SPARC]: Port sparc64 in-kernel device tree code to sparc32.
[SPARC64]: Add of_device layer and make ebus/isa use it.
...
Linus Torvalds [Sat, 24 Jun 2006 21:32:18 +0000 (14:32 -0700)]
Enable minimal per-device resume tracing
This is the minimal resume trace code to find which device resume (if
any) results in problems. Usually, you'd use the information this
generates as a starting point to adding more fine-grained trace event
points.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>