summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-01-09135-5052/+3346
|\
| * [ARM] 3246/1: S3C24XX - retab clock list in arch/arm/mach-s3c2410/clock.cBen Dooks2006-01-091-103/+103
| | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Properly tabulate the clock table in arch/arm/mach-s3c2410/clock.c and put the requisite commas on the end of the structs. Fix the comment about clock enable and disable in the setup code Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 3070/2: Add __ioremap_pfn() APIDeepak Saxena2006-01-094-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Deepak Saxena In working on adding 36-bit addressed supersection support to ioremap(), I came to the conclusion that it would be far simpler to do so by just splitting __ioremap() into a main external interface and adding an __ioremap_pfn() function that takes a pfn + offset into the page that __ioremap() can call. This way existing callers of __ioremap() won't have to change their code and 36-bit systems will just call __ioremap_pfn() and we will not have to deal with unsigned long long variables. Note that __ioremap_pfn() should _NOT_ be called directly by drivers but is reserved for use by arch_ioremap() implementations that map 32-bit resource regions into the real 36-bit address and then call this new function. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Only call set_type method in setup_irq if it's definedRussell King2006-01-091-1/+2
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * Merge Linus' tree.Russell King2006-01-09590-7654/+16671
| |\
| * | [ARM] AT91RM9200 doesn't need anything in dma.hRussell King2006-01-091-8/+0
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3240/2: AT91RM9200 support for 2.6 (Core)SAN People2006-01-0932-3/+3280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from SAN People Following changes were made to clock.c: 1) Replaced <asm/hardware/clock.h> with <linux/clk.h> 2) Removed old unused clk_enable & clk_disable. 3) Replaced clk_use/clk_unuse with clk_enable/clk_disable. Otherwise it's the same as the previous patch. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Make Acorn partition types depend on ACORN_PARTITIONRussell King2006-01-091-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | balamurugan reported a problem where it was possible to have the various Acorn partition types selected in the configuration, but ACORN_PARTITION disabled. Since ACORN_PARTITION controls whether we build fs/partitions/acorn.c, this lead to undefined references to the adfspart_check_TYPE symbols. Fix this by making the Acorn partition type symbols depend on ACORN_PARTITION. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Update am79c961 to use struct platform_driverRussell King2006-01-091-6/+6
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Remove asm/irq.h includes from ARM driversRussell King2006-01-0912-16/+10
| | | | | | | | | | | | | | | | | | | | | Many ARM drivers do not need to include asm/irq.h - remove this unnecessary include from some ARM drivers. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Remove CONFIG_ARCH_CAMELOT from defconfigsRussell King2006-01-0949-49/+0
| | | | | | | | | | | | | | | | | | EPXA10DB has gone, no need to keep the symbol in the defconfigs. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Update mach-typesRussell King2006-01-091-1/+29
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Remove EPXA10DB machine supportRussell King2006-01-0843-4973/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EPXA10DB seems to be uncared for: - the "PLD" code has never been merged - no one has reported that this platform has been broken since at least 2.6.10 - interest seems to have dried up around March 2003. Therefore, remove EPXA10DB support. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2006-01-094-10/+31
|\ \ \
| * | | [SERIAL] Make the number of UARTs registered configurable.Dave Jones2006-01-073-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a nr_uarts module option to the 8250 code to override this, up to a maximum of CONFIG_SERIAL_8250_NR_UARTS This should appease people who complain about a proliferation of /dev/ttyS & /sysfs nodes whilst at the same time allowing a single kernel image to support the rarer occasions of lots of devices. Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [SERIAL] Fix clocal wakeup problemRussell King2006-01-071-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jim Alexander reported a problem where "if one calls open() in blocking mode with CLOCAL off, the 8250.c driver under the 2.6 kernel (or at least 2.6.8 and 2.6.10) does not wake up the blocked process when DCD is asserted." Fix this by enabling modem status interrupts immediately before we read the carrier detect status. Thanks to Jim for reporting the problem and testing the fix. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds2006-01-094-266/+282
|\ \ \
| * | | [MMC] Indicate that R1/R1b contains command opcodePierre Ossman2006-01-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some controllers actually check the first byte of the response (most don't). This byte contains the command opcode for R1/R1b and all 1:s for other types. The difference must be indicated to the controller so it knows which reply to expect. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| * | | [MMC] Add DATA_MULTI flagRussell King2006-01-092-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some hosts need to know that a transfer will be multi-block. Add a data flag to indicate multiple data block transfers. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [MMC] Lindent wbsd driverPierre Ossman2006-01-081-252/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the coding style in the wbsd driver once and for all. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [MMC] Support MMC version 4 cardsPierre Ossman2006-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4 of the MMC specification increased the version number of the CID structure. None of the fields changed though so the only required change is adding '4' to the approved list. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [MMC] wbsd pnp suspendPierre Ossman2006-01-081-16/+90
| |/ / | | | | | | | | | | | | | | | | | | | | | Allow the wbsd driver to use the new suspend/resume functions added to the PnP layer. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvbLinus Torvalds2006-01-09203-5147/+10709
|\ \ \
| * | | V4L/DVB (3336): Bluebird firmware hosting moved to common dvb firmware dir ↵Michael Krufky2006-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on linuxtv.org - Get_dvb_firmware script updated accordingly: - my $url = "http://www.linuxtv.org/~mkrufky/dvb-usb-bluebird-01.fw"; + my $url = "http://www.linuxtv.org/download/dvb/firmware/dvb-usb-blue$ Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3329): cx88_subids whitespace cleanupChris Pascoe2006-01-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clean up a recently introduced spaces vs tabs whitespace problem. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3328): replace omitted 'TODO:'Michael Krufky2006-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - replace omitted 'TODO:' Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3327): Remove DViCO specific firmware hacks from the generic code.Patrick Boettcher2006-01-093-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the code that patches bluebird firmware before upload from the generic code into the cxusb driver itself. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3326): Fix stereo and standard reporting of msp3400 (esp. for radio)Hans Verkuil2006-01-094-59/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add VIDIOC_LOG_STATUS to the radio device ioctl list. - Reduce the confusion between modes and standards - Fix stereo reporting for radio. - Don't set i2c configuration if the chip doesn't support it. - Fix reporting of current standard for radio. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3325): WSS output interface for av7110Oliver Endriss2006-01-095-12/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Implemented v4l2 api for sliced vbi data output to pass WSS data from userspace to the av7110 Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3324): msp3400 audio handling bug fixes.Hans Verkuil2006-01-093-80/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check capabilities for audio settings (volume, balance, bass, treble, loudness, mute) - added loudness support - added missing VIDEO_AUDIO_BALANCE flags for v4l1 compatibility - do not call msp_any_detect_stereo for non-autoselect chips to retrieve the current stereo setting: that will temporarily mute the sound. It is only needed when the stereo mode might be changed, and for autoselect msp processors that do not periodically need to update their stereo setting. - do not wake up the thread if the standard did not change. Prevents temporary audio drop-out if the standard is set to the same value. - fix confused stereo detect code where V4L2_TUNER_SUB_STEREO and V4L2_TUNER_MODE_STEREO values were used incorrectly. - stereo mode reporting was broken (v4l2 value used to index a string array expecting v4l1 mode values). - do not set dsp register 0x30 in the 3410d thread: that register does not exist for pre-'G' revision msp chips. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3323): Add Kconfig option for wrongly programmed devicesMarc Koschewski2006-01-092-27/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - A new Kconfig option makes the user able to select if the dibusb-mb driver shall claim faulty programmed USB devices which are coming with default Cypress USB IDs. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3322): Whitespace cleanup and unused code removedMarc Koschewski2006-01-091-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some whitespaces cleaned up - unused code removed Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3321): Indention cleanupsMarc Koschewski2006-01-091-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Indention cleaned for tabsize=8 Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3320): Check if PLL-description is setPatrick Boettcher2006-01-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check if in the dvb-usb-device-structure the dvb_pll_desc is set before use. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3319): Changed indention for define's and their valuesMarc Koschewski2006-01-091-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Indention for values of several request defines were not TabSized=8. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3318): Fixes warning: variable "ret" is used before its value is setd binderman2006-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes compiling warning on kernel 2.6.15 with the Intel C compiler. - It said drivers/media/dvb/frontends/bcm3510.c(258): warning #592: variable "ret" is used before its value is set Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3317): msp3400: use v4l2_std_id and determine chip capabilities.Hans Verkuil2006-01-093-78/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace old norm by the v4l2_std_id values. - Add code to correctly detect the various capabilities of the various msp chips. It's not yet used, that's going to be the next step. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3315): Use correct AGC settings for DNTV Live! DVB-T ProChris Pascoe2006-01-091-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - My original settings for this board were incorrect and resulted in an increased number of signal dropouts. Replace this with the settings from the Windows driver. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3313): codingstyle cleanups & restore some wrongfully deleted ↵Michael Krufky2006-01-091-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dvb-usb-ids - codingstyle cleanups & restore some wrongfully deleted dvb-usb-ids Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3312): DViCO USB IR Remote supportChris Pascoe2006-01-092-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add support for the remote control receiver inside the DViCO FusionHDTV DVB-T Dual Digital, and a keymap for the MCE remote bundled with it. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3311): DViCO FusionHDTV DVB-T Dual Digital PCI supportChris Pascoe2006-01-094-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support for DVB reception on the PCI half of the DViCO DVB-T Dual Digital. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3310): DViCO Dual Digital DVB-T / USB bluebird updatesChris Pascoe2006-01-093-6/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add support for the USB portion of the DViCO Dual Digital board. Patch correct "warm" USB IDs into bluebird firmware before download. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3309): SAA7134: GPIO IRQ improvementsPeter Missel2006-01-092-28/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Saa7134-core.c saa7134_irq(): Separate GPIO16 and GPIO18 handling. Call IR-remote-GPIO handler only if the GPIO IRQ is "owned" by it. Added infrastructure to branch out to a future I2C-IR IRQ handler. saa7134-core.c saa7134_hwinit2(): Enable only the one GPIO pin and edge to trigger an IRQ that is wired as keyup/keydown mask. IRQ will only be generated for an actual key-down event. saa7134-input.c flyvideo_codes[]: Replace numpad keys with normal ones. Put meaning to mystery keys. Change some key definitions to have their functions match their labels better. Fix typos. saa7134-input.c flydvb_codes[]: Added new table for the larger remote that comes with the LifeView FlyDVB series. saa7134-input.c build_key(): In IRQ mode, signal key-down and then key-up straight in one go. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3307): Some cleanups at I2C modulesMauro Carvalho Chehab2006-01-0918-45/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - i2c names shorten - removed obsoleted flags on newer modules - small cleanups Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3305): Replaces old debug msgs to newer onesMauro Carvalho Chehab2006-01-092-52/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaces old debug msgs from bt832, tda743d and tda9875 to newer ones as defined under v4l2-common.h. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3303): Both AverTV Studio 303 cards #6 and #36 use the same IR ↵George Gazurkoff2006-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | programming. - Both AverTV Studio 303 cards, #6 and #36, use the same remote control programming. Signed-off-by: George Gazurkoff <gazurkoff@gmail.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3296): Fixes a bug at compat_ioctl32 kernel moduleGuy Martin2006-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There is a bug in the ioctl translations from 32bit userspace to 64bit kernelspace in do_set_window(). - The video window (vw) should be passed to native_ioctl() instead of the video clip. Signed-off-by: Guy Martin <gmsoft@tuxicoman.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3295): Add analog support for LifeView FlyDVB Trio.Peter Missel2006-01-093-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add support for LifeView FlyDVB Trio. - all analog inputs are supported and working, including FM radio - TO DO: dvb & remote control Signed-off-by: Peter Missel <peter.missel@onlinehome.de> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3294): Add Kworld/Vstream Xpert DVB-T card with cx22702 tuner.Manenti Marco2006-01-094-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add Kworld/Vstream Xpert DVB-T card with cx22702 tuner. Signed-off-by: Manenti Marco <marco_manenti@colman.it> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| * | | V4L/DVB (3293): Added digital support for cx88 (cx88-alsa)Mauro Carvalho Chehab2006-01-094-6/+872
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This module is co-authored by Ricardo Cerqueira <v4l@cerqueira.org>. - Added digital audio support for cx88-based boards that have function 01 enabled. These boards can be identified by having PCI id 1471:8801 or 1471:8811. - Increased DMA buffer from 512 to 4096 seems to fix audio distortion. - Existing audio DMA uses conflict with cx88-alsa. Should be disabled when cx88-alsa module is compiled. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
OpenPOWER on IntegriCloud