sfrench/cifs-2.6.git
10 years agoMerge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-stream...
Russell King [Thu, 25 Feb 2010 22:06:43 +0000 (22:06 +0000)]
Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel

10 years agoARM: 5958/1: ARM: U300: fix inverted clk round rate
Linus Walleij [Wed, 24 Feb 2010 20:49:53 +0000 (21:49 +0100)]
ARM: 5958/1: ARM: U300: fix inverted clk round rate

The clk_round_rate() functions in the U300 clocking will always
select the lowest clocking frequency due to inverted rounding
comparisons. Fix this.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5956/1: misplaced parentheses
Roel Kluin [Tue, 23 Feb 2010 22:37:22 +0000 (23:37 +0100)]
ARM: 5956/1: misplaced parentheses

The parentheses appear misplaced.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5955/1: ep93xx: move timer defines into core.c and document
Hartley Sweeten [Tue, 23 Feb 2010 20:45:22 +0000 (21:45 +0100)]
ARM: 5955/1: ep93xx: move timer defines into core.c and document

The timer defines are only used in core.c. Move them so
they will not be globaly exposed.

While here, add additional defines to document the magic
numbers used in the registers. Also, add some comments
for clarification.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
Hartley Sweeten [Tue, 23 Feb 2010 20:41:17 +0000 (21:41 +0100)]
ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c

The GPIO support in core.c handles the interrupt support for GPIO
ports A, B, and F. The gpiolib implementation in gpio.c needs to
access the function ep93xx_gpio_int_mask when a gpio pin is made
an output and ep93xx_gpio_update_int_params in order to update
the registers.

Moving this support from core.c to gpio.c allows making the two
functions static. It also keeps all the GPIO handling together in one
file.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5953/1: ep93xx: fix broken build of clock.c
Hartley Sweeten [Tue, 23 Feb 2010 20:20:31 +0000 (21:20 +0100)]
ARM: 5953/1: ep93xx: fix broken build of clock.c

Patch 5879/1: ep93xx: define magic numbers for pll1 and pll2 broke
the ep93xx build due to one missing rename of EP93XX_SYSCON_CLOCK_SET2.
The correct name should be EP93XX_SYSCON_CLKSET2.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5949/1: NUC900 add gpio virtual memory map
wanzongshun [Fri, 19 Feb 2010 04:23:36 +0000 (05:23 +0100)]
ARM: 5949/1: NUC900 add gpio virtual memory map

NUC900 add gpio virtual memory map

Signed-off-by: Wang Qiang <rurality.linux@gmail.com>
Signed-off-by: Wang Zongshun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5948/1: Enable timer0 to time4 clock support for nuc910
wanzongshun [Fri, 19 Feb 2010 04:21:51 +0000 (05:21 +0100)]
ARM: 5948/1: Enable timer0 to time4 clock support for nuc910

Enable timer0 to time4 clock support for nuc910

Signed-off-by: Wang Qiang <rurality.linux@gmail.com>
Signed-off-by: Wang Zongshun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
Linus Walleij [Fri, 19 Feb 2010 00:09:10 +0000 (01:09 +0100)]
ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk

This removes the custom DBG macro in favor of the in-kernel
dev_dbg() macro. Probably a leftover from a time when dev_dbg()
didn't yet exist. Also remove a printk() in favor of dev_err().

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: make_coherent(): fix problems with highpte, part 2
Russell King [Fri, 18 Dec 2009 16:43:57 +0000 (16:43 +0000)]
ARM: make_coherent(): fix problems with highpte, part 2

update_mmu_cache() is called with the page table for the faulted-in
page still mapped.  We need to modify the PTE for this page to ensure
coherency with other shared mappings when multiple shared mappings
exist within a MM.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoMM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
Russell King [Fri, 18 Dec 2009 16:40:18 +0000 (16:40 +0000)]
MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself

On VIVT ARM, when we have multiple shared mappings of the same file
in the same MM, we need to ensure that we have coherency across all
copies.  We do this via make_coherent() by making the pages
uncacheable.

This used to work fine, until we allowed highmem with highpte - we
now have a page table which is mapped as required, and is not available
for modification via update_mmu_cache().

Ralf Beache suggested getting rid of the PTE value passed to
update_mmu_cache():

  On MIPS update_mmu_cache() calls __update_tlb() which walks pagetables
  to construct a pointer to the pte again.  Passing a pte_t * is much
  more elegant.  Maybe we might even replace the pte argument with the
  pte_t?

Ben Herrenschmidt would also like the pte pointer for PowerPC:

  Passing the ptep in there is exactly what I want.  I want that
  -instead- of the PTE value, because I have issue on some ppc cases,
  for I$/D$ coherency, where set_pte_at() may decide to mask out the
  _PAGE_EXEC.

So, pass in the mapped page table pointer into update_mmu_cache(), and
remove the PTE value, updating all implementations and call sites to
suit.

Includes a fix from Stephen Rothwell:

  sparc: fix fallout from update_mmu_cache API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5945/1: ep93xx: include correct irq.h in core.c
Hartley Sweeten [Thu, 18 Feb 2010 17:16:11 +0000 (18:16 +0100)]
ARM: 5945/1: ep93xx: include correct irq.h in core.c

Currently <asm/mach/irq.h> is included by core.c. This header
includes <linux/irq.h> and defines a number of internal functions.
These internal functions are not needed by this file. Change the
include so that we just get what is needed.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5937/1: Add support for EP9315 based Snapper CL15 board
Ryan Mallon [Mon, 15 Feb 2010 00:16:01 +0000 (01:16 +0100)]
ARM: 5937/1: Add support for EP9315 based Snapper CL15 board

Add support for Bluewater Systems EP9315 based Snapper CL15 single board
computer module.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: Hartley Sweeten <hartleys@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: dma-mapping: fix for speculative prefetching
Russell King [Sat, 31 Oct 2009 16:52:16 +0000 (16:52 +0000)]
ARM: dma-mapping: fix for speculative prefetching

ARMv6 and ARMv7 CPUs can perform speculative prefetching, which makes
DMA cache coherency handling slightly more interesting.  Rather than
being able to rely upon the CPU not accessing the DMA buffer until DMA
has completed, we now must expect that the cache could be loaded with
possibly stale data from the DMA buffer.

Where DMA involves data being transferred to the device, we clean the
cache before handing it over for DMA, otherwise we invalidate the buffer
to get rid of potential writebacks.  On DMA Completion, if data was
transferred from the device, we invalidate the buffer to get rid of
any stale speculative prefetches.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
10 years agoARM: dma-mapping: remove dmac_clean_range and dmac_inv_range
Russell King [Thu, 26 Nov 2009 16:24:19 +0000 (16:24 +0000)]
ARM: dma-mapping: remove dmac_clean_range and dmac_inv_range

These are now unused, and so can be removed.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
10 years agoARM: dma-mapping: provide per-cpu type map/unmap functions
Russell King [Thu, 26 Nov 2009 16:19:58 +0000 (16:19 +0000)]
ARM: dma-mapping: provide per-cpu type map/unmap functions

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
10 years agoARM: dma-mapping: simplify dma_cache_maint_page
Russell King [Tue, 24 Nov 2009 14:41:01 +0000 (14:41 +0000)]
ARM: dma-mapping: simplify dma_cache_maint_page

dma_cache_maint_contiguous is now simple enough to live inside
dma_cache_maint_page, so move it there.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
10 years agoARM: dma-mapping: move selection of page ops out of dma_cache_maint_contiguous
Russell King [Tue, 24 Nov 2009 17:53:33 +0000 (17:53 +0000)]
ARM: dma-mapping: move selection of page ops out of dma_cache_maint_contiguous

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
10 years agoARM: dma-mapping: push buffer ownership down into dma-mapping.c
Russell King [Tue, 24 Nov 2009 16:27:17 +0000 (16:27 +0000)]
ARM: dma-mapping: push buffer ownership down into dma-mapping.c

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
10 years agoARM: dma-mapping: introduce the idea of buffer ownership
Russell King [Sat, 31 Oct 2009 16:52:16 +0000 (16:52 +0000)]
ARM: dma-mapping: introduce the idea of buffer ownership

The DMA API has the notion of buffer ownership; make it explicit in the
ARM implementation of this API.  This gives us a set of hooks to allow
us to deal with CPU cache issues arising from non-cache coherent DMA.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-By: Jamie Iles <jamie@jamieiles.com>
10 years agoARM: 5935/1: [U300] Fix the DMA configuration
Linus Walleij [Sun, 14 Feb 2010 18:41:35 +0000 (19:41 +0100)]
ARM: 5935/1: [U300] Fix the DMA configuration

This fixes a few bugs in the DMA configuration for the COH 901 318
DMA engine used in U300. It also removes the directional parameter
for each channel: separate DMA engine patches (submitted to the
DMA engine maintainer) switches that mechanism over to using
dynamic configuration of this, to handle bidirectional DMA
channels.

Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5932/1: ux500: fix DEBUG_LL/earlyprintk
Rabin Vincent [Fri, 12 Feb 2010 05:23:07 +0000 (06:23 +0100)]
ARM: 5932/1: ux500: fix DEBUG_LL/earlyprintk

Add a static mapping for the UART and correct its virtual address in
debug-macro.S, to make DEBUG_LL/earlyprintk work.

Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: Fix badly placed nuc932 Kconfig entry
Russell King [Thu, 4 Feb 2010 18:13:17 +0000 (18:13 +0000)]
ARM: Fix badly placed nuc932 Kconfig entry

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5914/1: Modify PL031 for Nomadik and U8500 v2
Linus Walleij [Thu, 4 Feb 2010 11:50:13 +0000 (12:50 +0100)]
ARM: 5914/1: Modify PL031 for Nomadik and U8500 v2

This extends the existing PrimeCell PL031 driver with support for
the ST Microelectronics and ST-Ericsson derivatives, in a first
and second version as used on the Nomadik and U8500 platforms.
It also rids the old ioctl() alarm on/off functions in favor of
the new .alarm_irq_enable field of the RTC class ops.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5913/1: ARM U8500: add I2C platform configurations
Srinidhi Kasagar [Wed, 3 Feb 2010 12:02:48 +0000 (13:02 +0100)]
ARM: 5913/1: ARM U8500: add I2C platform configurations

This adds platform configurations to support four
i2c controllers found on early MOP500 platform

This depends on the patch 5908/1 for build to succeed.

Signed-off-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5908/1: nomadik: add platform specific i2c configuration
Srinidhi Kasagar [Mon, 1 Feb 2010 13:58:22 +0000 (14:58 +0100)]
ARM: 5908/1: nomadik: add platform specific i2c configuration

This adds the platform specific i2c configuration
data structures to setup the nomadik/ux500 i2c block.

Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
10 years agoARM: 5915/1: Add RTC PL031 derivative platform config for ux500
Linus Walleij [Thu, 4 Feb 2010 11:50:58 +0000 (12:50 +0100)]
ARM: 5915/1: Add RTC PL031 derivative platform config for ux500

This configures the PL031 RTC resources for ux500.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5869/1: ixp4xx: implement sched_clock()
Mikael Pettersson [Sat, 9 Jan 2010 12:03:59 +0000 (13:03 +0100)]
ARM: 5869/1: ixp4xx: implement sched_clock()

Add a better sched_clock() to the ixp4xx platform,
implemented via its clocksource support.

This is based on the sched_clock() I implemented for
the IOP platform. Tested on a ds101 ixp420 machine.

Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5859/1: Add nuc93x platform support
wanzongshun [Thu, 31 Dec 2009 14:06:05 +0000 (15:06 +0100)]
ARM: 5859/1: Add nuc93x platform support

The previous nuc932 support patches have been discarded by me and because it belongs to
another SoCs series named nuc93x,at present, which included nuc931 and nuc932, I think it is
better to create a new mach-nuc93x,So I made the patch,and request your advice.Thanks!

Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5896/1: MMCI: work around a hardware bug in U300
Linus Walleij [Mon, 25 Jan 2010 06:14:46 +0000 (07:14 +0100)]
ARM: 5896/1: MMCI: work around a hardware bug in U300

In the U300 some hardware bug makes the status flag not come up
signalling a successful write (or anything else, like an error, for
that matter) on write requests. This little quirk makes the writes
work on U300.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5895/2: Alter name of U300 watchdog resource
Linus Walleij [Mon, 25 Jan 2010 06:18:16 +0000 (07:18 +0100)]
ARM: 5895/2: Alter name of U300 watchdog resource

This changes the bus name of the U300 watchdog from just "wdog"
to "coh901327_wdog" which is used to match the corresponding
driver. This makes the watchdog probe properly.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5893/1: SPI AMBA PL022: Limit TX FIFO fills
Linus Walleij [Fri, 22 Jan 2010 12:53:30 +0000 (13:53 +0100)]
ARM: 5893/1: SPI AMBA PL022: Limit TX FIFO fills

Added logic to cap TX FIFO fill size based on current free RX
FIFO entries instead of TX status flags. This is to prevent
an issue with RX FIFO overflows.

Signed-off-by: Kevin Wells <kevin.wells@nxp.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5852/1: Add COH 901 318 DMA driver platform config for U300
Linus Walleij [Thu, 17 Dec 2009 08:46:24 +0000 (09:46 +0100)]
ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300

This adds platform configuration for the COH 901 318 DMA driver
for the U300 series mobile platforms.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5892/1: ep93xx: Add support for Simplemachines Sim.One board
Ryan Mallon [Fri, 22 Jan 2010 00:42:02 +0000 (01:42 +0100)]
ARM: 5892/1: ep93xx: Add support for Simplemachines Sim.One board

Add support for the Simplemachines EP9307 based Sim.One board.

Cc: Hartley Sweeten <hartleys@visionengravers.com>
Cc: Sergio Sorrenti <sergio.sorrenti@gmail.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: Hartley Sweeten <hartleys@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: make_coherent: avoid recalculating the pfn for the modified page
Russell King [Fri, 18 Dec 2009 16:31:38 +0000 (16:31 +0000)]
ARM: make_coherent: avoid recalculating the pfn for the modified page

We already know the pfn for the page to be modified in make_coherent,
so let's stop recalculating it unnecessarily.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: make_coherent: fix problems with highpte, part 1
Russell King [Fri, 18 Dec 2009 16:24:34 +0000 (16:24 +0000)]
ARM: make_coherent: fix problems with highpte, part 1

update_mmu_cache() is called with a page table already mapped.  We
call make_coherent(), which then calls adjust_pte() which wants to
map other page tables.  This causes kmap_atomic() to BUG() because
the slot its trying to use is already taken.

Since do_adjust_pte() modifies the page tables, we are also missing
any form of locking, so we're risking corrupting the page tables.

Fix this by using pte_offset_map_nested(), and taking the pte page
table lock around do_adjust_pte().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: make_coherent: convert adjust_pte() to use p*d_none_or_clear_bad()
Russell King [Fri, 18 Dec 2009 16:23:44 +0000 (16:23 +0000)]
ARM: make_coherent: convert adjust_pte() to use p*d_none_or_clear_bad()

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: make_coherent: split adjust_pte() in two
Russell King [Fri, 18 Dec 2009 16:21:35 +0000 (16:21 +0000)]
ARM: make_coherent: split adjust_pte() in two

adjust_pte() walks the page tables, and do_adjust_pte() does the
page table manipulation.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5851/1: [AT91] AT572D940HF-EK board support
Andrew Victor [Tue, 15 Dec 2009 21:00:18 +0000 (22:00 +0100)]
ARM: 5851/1: [AT91] AT572D940HF-EK board support

Add support for the Atmel AT572D940HF-EK board (development board for
the AT572D940HF processor).

Signed-off-by: Antonio R. Costa <costa.antonior@gmail.com>
Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5850/1: [AT91] AT572D940HF processor support
Andrew Victor [Tue, 15 Dec 2009 20:57:27 +0000 (21:57 +0100)]
ARM: 5850/1: [AT91] AT572D940HF processor support

Add support for the Atmel AT572D940HF processor (DIOPSIS range).
This processor integrates an ARM926 core, a DSP and the SoC
peripherals usually found on an AT91 processor (USART, SSC, SPI, TWI,
CAN, etc)

Signed-off-by: Antonio R. Costa <costa.antonior@gmail.com>
Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 5881/1: vic.c: reorganize code
Hartley Sweeten [Tue, 12 Jan 2010 18:09:12 +0000 (19:09 +0100)]
ARM: 5881/1: vic.c: reorganize code

This reorganizes the vic.c code in anticipation of a second patch
to use struct vic_device as the data stored in set_irq_chip_data().

The code now has the following flow:

1) struct vic_device definition, static variables, and to_vic()
   moved to the start of the code.
2) common code (vic_init2)
3) vic power management callbacks
4) vic power management initialization/registration
5) irq_chip callbacks
6) vendor specific vic initialization
7) vic initialization

In addition the typo vik_init_st is fixed (vic_init_st).

There is no functional change with this patch.

Tested-by: Linus Walleij <linus.walleij@stericsson.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Alessandro Rubini <rubini-list@gnudd.com>
Comments from Hartley Sweeten:

 Please change from Cc to:
Tested-by: Alessandro Rubini <rubini@unipv.it>
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
Linus Torvalds [Mon, 18 Jan 2010 22:20:15 +0000 (14:20 -0800)]
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs

11 years agox86, apic: use logical flat for systems with <= 8 logical cpus
Suresh Siddha [Mon, 18 Jan 2010 20:10:49 +0000 (12:10 -0800)]
x86, apic: use logical flat for systems with <= 8 logical cpus

We can use logical flat mode if there are <= 8 logical cpu's
(irrespective of physical apic id values).  This will enable simplified
and efficient IPI and device interrupt routing on such platforms.

This has been tested to work on both Intel and AMD platforms.
Exceptions like IBM summit platform which can't use logical flat mode
are addressed by using OEM platform checks.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Chris McDermott <lcm@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agox86, apic: use physical mode for IBM summit platforms
Suresh Siddha [Mon, 18 Jan 2010 20:10:48 +0000 (12:10 -0800)]
x86, apic: use physical mode for IBM summit platforms

Chris McDermott from IBM confirmed that hurricane chipset in IBM summit
platforms doesn't support logical flat mode.  Irrespective of the other
things like apic_id's, total number of logical cpu's, Linux kernel
should default to physical mode for this system.

The 32-bit kernel does so using the OEM checks for the IBM summit
platform.  Add a similar OEM platform check for the 64bit kernel too.

Otherwise the linux kernel boot can hang on this platform under certain
bios/platform settings.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Tested-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Chris McDermott <lcm@linux.vnet.ibm.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
Linus Torvalds [Mon, 18 Jan 2010 22:13:17 +0000 (14:13 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: Remove warning message for invalid OSS minor ranges
  ALSA: hda - Fix capture on Sony VAIO with single input
  ALSA: hda - Fix mute led GPIO on HP dv-series notebooks
  ALSA: use subsys_initcall for sound core instead of module_init
  ALSA: hda - Fix missing capture mixer for ALC861/660 codecs
  ALSA: hda - Improved MacBook (Pro) 5,1 / 5,2 support
  ALSA: hda - Fix Toshiba NB20x quirk entry

11 years agoMerge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
Linus Torvalds [Mon, 18 Jan 2010 22:12:42 +0000 (14:12 -0800)]
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: pci_controller->arch_data really is a struct device_node *
  microblaze: Add missing double apostrophe in Kconfig
  microblaze: Add PT_ macros for special purpose regs
  microblaze: Enable accept4 syscall
  microblaze: Wire up recvmmsg syscall

11 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Linus Torvalds [Mon, 18 Jan 2010 22:11:26 +0000 (14:11 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Unlock mc13783 before subsystems initialisation, at probe time.
  mfd: WM835x GPIO direction register is not locked
  mfd: tmio_mmc hardware abstraction for CNF area
  mfd: WM8350 off by one bug
  mfd: Correct WM835x ISINK ramp time defines

11 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Linus Torvalds [Mon, 18 Jan 2010 22:08:55 +0000 (14:08 -0800)]
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Move cpu hotplug driver lock from pseries to powerpc
  powerpc: Move /proc/ppc64 to /proc/powerpc update
  powerpc/8xx: Fix user space TLB walk in dcbX fixup
  powerpc: Fix decrementer setup on 1GHz boards
  powerpc/iseries: Initialise on-stack completion
  powerpc/hvc: Driver build breaks with !HVC_CONSOLE
  serial/pmac_zilog: Workaround problem due to interrupt on closed port
  powerpc/macintosh: Make Open Firmware device id constant
  powerpc: Use helpers for rlimits
  powerpc: cpumask_of_node() should handle -1 as a node
  powerpc/pseries: Fix dlpar compile warning without CONFIG_PROC_DEVICETREE
  powerpc/pseries: Fix xics interrupt affinity
  powerpc/swsusp_32: Fix TLB invalidation
  powerpc/8xx: Always pin kernel instruction TLB
  powerpc: 2.6.33 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
  powerpc: Use scripts/mkuboot.sh instead of 'mkimage'
  powerpc/5200: update defconfigs

11 years agoMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
Linus Torvalds [Mon, 18 Jan 2010 22:08:07 +0000 (14:08 -0800)]
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: xfs_swap_extents needs to handle dynamic fork offsets
  xfs: fix missing error check in xfs_rtfree_range
  xfs: fix stale inode flush avoidance
  xfs: Remove inode iolock held check during allocation
  xfs: reclaim all inodes by background tree walks
  xfs: Avoid inodes in reclaim when flushing from inode cache
  xfs: reclaim inodes under a write lock

11 years agoMerge branch 'mantis' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
Linus Torvalds [Mon, 18 Jan 2010 22:07:07 +0000 (14:07 -0800)]
Merge branch 'mantis' of git://git./linux/kernel/git/mchehab/linux-2.6

* 'mantis' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (117 commits)
  V4L/DVB (13851): Fix Input dependency for Mantis
  V4L/DVB(13824a): mantis: Fix __devexit bad annotations
  V4L/DVB (13808b): mantis: replace DMA_nnBIT_MASK to DMA_BIT_MASK(32)
  V4L/DVB (13808): [Mantis/Hopper] Build update for Mantis/Hopper based cards
  V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions
  V4L/DVB (13812): [Mantis/Hopper] Update Copyright header
  V4L/DVB (13811): [MB86A16] Update Copyright header
  V4L/DVB (13810): [MB86A16] Use DVB_* macros
  V4L/DVB (13809): Fix Checkpatch violations
  V4L/DVB (13807): Fix: Free device in the device registration failure case
  V4L/DVB (13806): Register and Initialize Remote control
  V4L/DVB (13805): Fix: Unregister the frontend before detaching
  V4L/DVB (13804): Remove unused I2C Adapter ID
  V4L/DVB (13803): Remove unused dependency on CU1216
  V4L/DVB (13802): [Mantis/Hopper] Fix all build related warnings
  V4L/DVB (13801): [MB86A16] Use the search callback
  V4L/DVB (13800): [Mantis] I2C optimization. Required delay is much lesser than 1mS.
  V4L/DVB (13799): [Mantis] Unregister frontend
  V4L/DVB (13798): [Mantis] Enable power for all cards, use byte mode only on relevant devices
  V4L/DVB (13797): [Mantis/Hopper/TDA665x] Large overhaul,
  ...

11 years agoMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
Linus Torvalds [Mon, 18 Jan 2010 22:06:52 +0000 (14:06 -0800)]
Merge branch 'for_linus' of git://git./linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (23 commits)
  V4L/DVB (13966): DVB-T regression fix for saa7134 cards
  V4L/DVB (13955): cx25821: fix double unlock in medusa_video_init()
  MAINTAINERS: ivtv-devel is moderated
  MAINTAINERS: Andy Walls is the new ivtv maintainer
  V4L/DVB (13941): rj54n1cb0c: remove compiler warning
  V4L/DVB sh_mobile_ceu: don't check platform_get_irq's return value against zero
  V4L/DVB mx1_camera: don't check platform_get_irq's return value against zero
  V4L/DVB (13934): tda8290: Fix FM radio easy programming standard selection for TDA8295
  V4L/DVB (13900): gspca - sunplus: Fix bridge exchanges.
  V4L/DVB (13887): tda8290: add autodetection support for TDA8295c2
  V4L/DVB (13882): gspca - stv06xx-vv6410: Ensure register STV_SCAN_RATE is zero
  V4L/DVB (13880): gspca - m5602-s5k4aa: Add vflip quirk for the Amilo Xi 2428
  V4L/DVB (13875): gspca - vc032x: Fix a possible crash with the vc0321 bridge.
  V4L/DVB (13868): gspca - sn9c20x: Fix test of unsigned.
  V4L/DVB (13858): ir-keytable: use the right header
  feature-removal-schedule: Add v4l1 drivers obsoleted by gspca sub drivers
  V4L/DVB (13622): gspca - ov534: Fix a compilation warning.
  V4L/DVB (13834): dib8000: fix compilation if !DVB_DIB8000
  V4L/DVB (13831): uvcvideo: Fix oops caused by a race condition in buffer dequeuing
  V4L/DVB (13829): uvcvideo: Fix alternate setting selection in isochronous mode
  ...

11 years ago[WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs
Seth Heasley [Thu, 14 Jan 2010 20:58:05 +0000 (20:58 +0000)]
[WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs

This patch adds the Intel Cougar Point and PCH DeviceIDs for iTCO Watchdog.

Signed-off-by: Seth Heasley <seth.heasley@intel.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
11 years agomicroblaze: pci_controller->arch_data really is a struct device_node *
Michal Simek [Wed, 13 Jan 2010 14:29:52 +0000 (15:29 +0100)]
microblaze: pci_controller->arch_data really is a struct device_node *

we are follow powerpc change:
44ef339073f67d4abcc62ae52a5fbc069d7a4d29

Signed-off-by: Michal Simek <monstr@monstr.eu>
11 years agomicroblaze: Add missing double apostrophe in Kconfig
Michal Simek [Tue, 12 Jan 2010 10:05:49 +0000 (11:05 +0100)]
microblaze: Add missing double apostrophe in Kconfig

Signed-off-by: Michal Simek <monstr@monstr.eu>
11 years agomicroblaze: Add PT_ macros for special purpose regs
Michal Simek [Mon, 28 Dec 2009 13:25:15 +0000 (14:25 +0100)]
microblaze: Add PT_ macros for special purpose regs

PT_ macros are used by gdb and strace uses them too.

Signed-off-by: Michal Simek <monstr@monstr.eu>
11 years agomicroblaze: Enable accept4 syscall
Michal Simek [Mon, 28 Dec 2009 13:24:21 +0000 (14:24 +0100)]
microblaze: Enable accept4 syscall

We had wrong name in unistd.h + I wire up this syscall
in syscall table.

Signed-off-by: Michal Simek <monstr@monstr.eu>
11 years agomicroblaze: Wire up recvmmsg syscall
Michal Simek [Mon, 28 Dec 2009 13:21:46 +0000 (14:21 +0100)]
microblaze: Wire up recvmmsg syscall

Patch a2e2725541fad72416326798c2d7fa4dafb7d337 should
contain change in unistd.h too. The same problem
had MIPS.

Signed-off-by: Michal Simek <monstr@monstr.eu>
11 years agoMerge branch 'fix/hda' into for-linus
Takashi Iwai [Mon, 18 Jan 2010 13:20:55 +0000 (14:20 +0100)]
Merge branch 'fix/hda' into for-linus

11 years agoALSA: Remove warning message for invalid OSS minor ranges
Takashi Iwai [Mon, 18 Jan 2010 13:16:24 +0000 (14:16 +0100)]
ALSA: Remove warning message for invalid OSS minor ranges

When a card instance with a higher card number is registered, warning
messages are spewed eventually with stack traces due to the invalid minor
number for OSS device registration.  For example, thinkpad-acpi registers
the card number 29 as default, and you'll see always these messages.
This is rather confusing (and worries users), thus better to return
simply the error code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agomfd: Unlock mc13783 before subsystems initialisation, at probe time.
Alberto Panizzo [Mon, 14 Dec 2009 17:18:05 +0000 (18:18 +0100)]
mfd: Unlock mc13783 before subsystems initialisation, at probe time.

With this, mc13783 subsystems drivers can configure the mc13783 chip
reading and writing registers.

Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
11 years agomfd: WM835x GPIO direction register is not locked
Mark Brown [Thu, 7 Jan 2010 16:16:14 +0000 (16:16 +0000)]
mfd: WM835x GPIO direction register is not locked

No need to set the security key when writing to it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
11 years agomfd: tmio_mmc hardware abstraction for CNF area
Ian Molton [Wed, 6 Jan 2010 12:51:48 +0000 (13:51 +0100)]
mfd: tmio_mmc hardware abstraction for CNF area

This patch abstracts out the CNF area code from tmio_mmc which
is not present in all hardware that can use this driver. This
is required so that we can support non-toshiba based hardware.

ASIC3 support by Philipp Zabel

Signed-off-by: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
11 years agomfd: WM8350 off by one bug
Dan Carpenter [Tue, 5 Jan 2010 13:59:06 +0000 (13:59 +0000)]
mfd: WM8350 off by one bug

If irq == WM8350_NUM_IRQ that would put us past the end of the array.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
11 years agomfd: Correct WM835x ISINK ramp time defines
Mark Brown [Mon, 4 Jan 2010 18:05:00 +0000 (18:05 +0000)]
mfd: Correct WM835x ISINK ramp time defines

The constants used to specify ISINK ramp times for WM835x had the
wrong shifts so that the on times applied to the off ramp and vice
versa. The masks for the bitfields are correct.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
11 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
Linus Torvalds [Sun, 17 Jan 2010 19:01:16 +0000 (11:01 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  do_add_mount() should sanitize mnt_flags
  CIFS shouldn't make mountpoints shrinkable
  mnt_flags fixes in do_remount()
  attach_recursive_mnt() needs to hold vfsmount_lock over set_mnt_shared()
  may_umount() needs namespace_sem
  Fix configfs leak
  Fix the -ESTALE handling in do_filp_open()
  ecryptfs: Fix refcnt leak on ecryptfs_follow_link() error path
  Fix ACC_MODE() for real
  Unrot uml mconsole a bit
  hppfs: handle ->put_link()
  Kill 9p readlink()
  fix autofs/afs/etc. magic mountpoint breakage

11 years agomodpost: fix segfault in sym_is() with prefixed arches
Mike Frysinger [Sat, 16 Jan 2010 21:57:34 +0000 (08:27 +1030)]
modpost: fix segfault in sym_is() with prefixed arches

The sym_is() compares a symbol in an attempt to automatically skip symbol
prefixes.  It does this first by searching the real symbol with the normal
unprefixed symbol.  But then it uses the length of the original symbol to
check the end of the substring instead of the length of the symbol it is
looking for.  On non-prefixed arches, this is effectively the same thing,
so there is no problem.  On prefixed-arches, since this is exceeds by just
one byte, a crash is rare and it is usually a NUL byte anyways.  But every
once in a blue moon, you get the right page alignment and it segfaults.

For example, on the Blackfin arch, sym_is() will be called with the real
symbol "___mod_usb_device_table" as "symbol" when looking for the normal
symbol "__mod_usb_device_table" as "name".  The substring will thus return
one byte into "symbol" and store it into "match".  But then "match" will
be indexed with the length of "symbol" instead of "name" and so we will
exceed the storage.  i.e. the code ends up doing:
char foo[] = "abc"; return foo[strlen(foo)+1] == '\0';

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoV4L/DVB (13851): Fix Input dependency for Mantis
Manu Abraham [Sat, 19 Dec 2009 17:11:50 +0000 (14:11 -0300)]
V4L/DVB (13851): Fix Input dependency for Mantis

>
>
>
> CONFIG_INPUT=n

As reported by Randy Dunlap <randy.dunlap@oracle.com>:
> ERROR: "ir_input_register" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> ERROR: "ir_input_unregister" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> ERROR: "ir_input_init" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> ERROR: "input_free_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> ERROR: "input_allocate_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB(13824a): mantis: Fix __devexit bad annotations
Mauro Carvalho Chehab [Fri, 18 Dec 2009 11:58:46 +0000 (09:58 -0200)]
V4L/DVB(13824a): mantis: Fix __devexit bad annotations

WARNING: drivers/media/dvb/mantis/built-in.o(.devinit.text+0x13d7): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_i2c_exit()
The function __devinit mantis_pci_probe() references
a function __devexit mantis_i2c_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_i2c_exit() so it may be used outside an exit section.

WARNING: drivers/media/dvb/mantis/built-in.o(.devinit.text+0x1433): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_pci_exit()
The function __devinit mantis_pci_probe() references
a function __devexit mantis_pci_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_pci_exit() so it may be used outside an exit section.

WARNING: drivers/media/dvb/mantis/built-in.o(.devinit.text+0x185e): Section mismatch in reference from the function hopper_pci_probe() to the function
.devexit.text:mantis_i2c_exit()
The function __devinit hopper_pci_probe() references
a function __devexit mantis_i2c_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_i2c_exit() so it may be used outside an exit section.

WARNING: drivers/media/dvb/mantis/built-in.o(.devinit.text+0x18ba): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_pci_exit()
The function __devinit hopper_pci_probe() references
a function __devexit mantis_pci_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_pci_exit() so it may be used outside an exit section.

WARNING: drivers/media/dvb/built-in.o(.devinit.text+0x68b8): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_i2c_exit()
The function __devinit mantis_pci_probe() references
a function __devexit mantis_i2c_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_i2c_exit() so it may be used outside an exit section.

WARNING: drivers/media/dvb/built-in.o(.devinit.text+0x6914): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_pci_exit()
The function __devinit mantis_pci_probe() references
a function __devexit mantis_pci_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_pci_exit() so it may be used outside an exit section.

WARNING: drivers/media/dvb/built-in.o(.devinit.text+0x6d3f): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_i2c_exit()
The function __devinit hopper_pci_probe() references
a function __devexit mantis_i2c_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_i2c_exit() so it may be used outside an exit section.

WARNING: drivers/media/dvb/built-in.o(.devinit.text+0x6d9b): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_pci_exit()
The function __devinit hopper_pci_probe() references
a function __devexit mantis_pci_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_pci_exit() so it may be used outside an exit section.

WARNING: drivers/media/built-in.o(.devinit.text+0x14634): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_i2c_exit()
The function __devinit mantis_pci_probe() references
a function __devexit mantis_i2c_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_i2c_exit() so it may be used outside an exit section.

WARNING: drivers/media/built-in.o(.devinit.text+0x14690): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_pci_exit()
The function __devinit mantis_pci_probe() references
a function __devexit mantis_pci_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_pci_exit() so it may be used outside an exit section.

WARNING: drivers/media/built-in.o(.devinit.text+0x14abb): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_i2c_exit()
The function __devinit hopper_pci_probe() references
a function __devexit mantis_i2c_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_i2c_exit() so it may be used outside an exit section.

WARNING: drivers/media/built-in.o(.devinit.text+0x14b17): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_pci_exit()
The function __devinit hopper_pci_probe() references
a function __devexit mantis_pci_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
mantis_pci_exit() so it may be used outside an exit section.

Acked-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13808b): mantis: replace DMA_nnBIT_MASK to DMA_BIT_MASK(32)
Mauro Carvalho Chehab [Thu, 17 Dec 2009 02:06:04 +0000 (00:06 -0200)]
V4L/DVB (13808b): mantis: replace DMA_nnBIT_MASK to DMA_BIT_MASK(32)

drivers/media/dvb/mantis/mantis_pci.c: In function ‘mantis_pci_init’:
drivers/media/dvb/mantis/mantis_pci.c:76: warning: ‘DMA_nnBIT_MASK’ is deprecated

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13808): [Mantis/Hopper] Build update for Mantis/Hopper based cards
Manu Abraham [Sat, 5 Dec 2009 04:24:08 +0000 (01:24 -0300)]
V4L/DVB (13808): [Mantis/Hopper] Build update for Mantis/Hopper based cards

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions
Mauro Carvalho Chehab [Thu, 17 Dec 2009 01:57:27 +0000 (23:57 -0200)]
V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions

Fix a merge conflict between mantis and IR cleanups

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13812): [Mantis/Hopper] Update Copyright header
Manu Abraham [Tue, 15 Dec 2009 12:13:49 +0000 (09:13 -0300)]
V4L/DVB (13812): [Mantis/Hopper] Update Copyright header

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13811): [MB86A16] Update Copyright header
Manu Abraham [Tue, 15 Dec 2009 12:04:59 +0000 (09:04 -0300)]
V4L/DVB (13811): [MB86A16] Update Copyright header

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13810): [MB86A16] Use DVB_* macros
Manu Abraham [Tue, 15 Dec 2009 12:01:27 +0000 (09:01 -0300)]
V4L/DVB (13810): [MB86A16] Use DVB_* macros

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13809): Fix Checkpatch violations
Manu Abraham [Tue, 15 Dec 2009 11:47:21 +0000 (08:47 -0300)]
V4L/DVB (13809): Fix Checkpatch violations

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13807): Fix: Free device in the device registration failure case
Manu Abraham [Sat, 12 Dec 2009 06:14:25 +0000 (03:14 -0300)]
V4L/DVB (13807): Fix: Free device in the device registration failure case

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13806): Register and Initialize Remote control
Manu Abraham [Fri, 11 Dec 2009 23:41:07 +0000 (20:41 -0300)]
V4L/DVB (13806): Register and Initialize Remote control

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13805): Fix: Unregister the frontend before detaching
Manu Abraham [Wed, 9 Dec 2009 22:59:26 +0000 (19:59 -0300)]
V4L/DVB (13805): Fix: Unregister the frontend before detaching

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13804): Remove unused I2C Adapter ID
Manu Abraham [Wed, 9 Dec 2009 22:27:17 +0000 (19:27 -0300)]
V4L/DVB (13804): Remove unused I2C Adapter ID

Signed-off-by: <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13803): Remove unused dependency on CU1216
Manu Abraham [Wed, 9 Dec 2009 22:00:33 +0000 (19:00 -0300)]
V4L/DVB (13803): Remove unused dependency on CU1216

Thanks to Matthias Wachter <mathias@waechter.wiz.at>
for pointing it out.

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13802): [Mantis/Hopper] Fix all build related warnings
Manu Abraham [Tue, 15 Dec 2009 09:17:54 +0000 (06:17 -0300)]
V4L/DVB (13802): [Mantis/Hopper] Fix all build related warnings

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13801): [MB86A16] Use the search callback
Manu Abraham [Tue, 15 Dec 2009 09:15:27 +0000 (06:15 -0300)]
V4L/DVB (13801): [MB86A16] Use the search callback

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13800): [Mantis] I2C optimization. Required delay is much lesser than 1mS.
Manu Abraham [Fri, 4 Dec 2009 12:02:00 +0000 (09:02 -0300)]
V4L/DVB (13800): [Mantis] I2C optimization. Required delay is much lesser than 1mS.

Do not wait, keep looping instead.

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13799): [Mantis] Unregister frontend
Manu Abraham [Fri, 4 Dec 2009 12:01:35 +0000 (09:01 -0300)]
V4L/DVB (13799): [Mantis] Unregister frontend

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13798): [Mantis] Enable power for all cards, use byte mode only on relevant...
Manu Abraham [Fri, 4 Dec 2009 08:57:28 +0000 (05:57 -0300)]
V4L/DVB (13798): [Mantis] Enable power for all cards, use byte mode only on relevant devices

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13797): [Mantis/Hopper/TDA665x] Large overhaul,
Manu Abraham [Fri, 4 Dec 2009 08:56:35 +0000 (05:56 -0300)]
V4L/DVB (13797): [Mantis/Hopper/TDA665x] Large overhaul,

* Initial go at VP-3028, VP-3030 devices.
* I2C communication improvements,
* Add TDA665x support

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13796): [Mantis] Add missing file in previous commit
Manu Abraham [Fri, 4 Dec 2009 08:41:52 +0000 (05:41 -0300)]
V4L/DVB (13796): [Mantis] Add missing file in previous commit

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13795): [Mantis/Hopper] Code overhaul, add Hopper devices into the PCI ID...
Manu Abraham [Fri, 4 Dec 2009 08:41:11 +0000 (05:41 -0300)]
V4L/DVB (13795): [Mantis/Hopper] Code overhaul, add Hopper devices into the PCI ID list

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13794): [Mantis/VP-3028] Initial go at Serial interface implementation,...
Manu Abraham [Fri, 4 Dec 2009 08:39:57 +0000 (05:39 -0300)]
V4L/DVB (13794): [Mantis/VP-3028] Initial go at Serial interface implementation, add support for VP-3028

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13792): [Mantis/VP-2033] Do not claim TDA10023
Niklas Edmundsson [Fri, 4 Dec 2009 08:38:52 +0000 (05:38 -0300)]
V4L/DVB (13792): [Mantis/VP-2033] Do not claim TDA10023

Do not rely on the PCI ID alone

Signed-off-by: Niklas Edmundsson <nikke@acc.umu.se>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13791): [TDA10021] Do not claim TDA10023
Niklas Edmundsson [Fri, 4 Dec 2009 08:38:21 +0000 (05:38 -0300)]
V4L/DVB (13791): [TDA10021] Do not claim TDA10023

Signed-off-by: Niklas Edmundsson <nikke@acc.umu.se>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13790): [Mantis] Relocate queue initialization
Manu Abraham [Fri, 4 Dec 2009 08:35:07 +0000 (05:35 -0300)]
V4L/DVB (13790): [Mantis] Relocate queue initialization

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13789): [Mantis CA] Initialize the mutex
Manu Abraham [Fri, 4 Dec 2009 08:34:44 +0000 (05:34 -0300)]
V4L/DVB (13789): [Mantis CA] Initialize the mutex

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13788): [Mantis CA] use a lock for the relevant CI Read/Write operations
Manu Abraham [Fri, 4 Dec 2009 08:34:19 +0000 (05:34 -0300)]
V4L/DVB (13788): [Mantis CA] use a lock for the relevant CI Read/Write operations

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13787): [Mantis] Fix build
Manu Abraham [Fri, 4 Dec 2009 08:33:56 +0000 (05:33 -0300)]
V4L/DVB (13787): [Mantis] Fix build

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13786): [Mantis] Bug: HIF bits already shifted ..
Manu Abraham [Fri, 4 Dec 2009 08:33:31 +0000 (05:33 -0300)]
V4L/DVB (13786): [Mantis] Bug: HIF bits already shifted ..

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13785): [Mantis] Do not disable IRQ's while being invoked
Manu Abraham [Fri, 4 Dec 2009 08:33:10 +0000 (05:33 -0300)]
V4L/DVB (13785): [Mantis] Do not disable IRQ's while being invoked

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13784): [Mantis] Use PCI API instead of hardcoded length
Manu Abraham [Fri, 4 Dec 2009 08:32:51 +0000 (05:32 -0300)]
V4L/DVB (13784): [Mantis] Use PCI API instead of hardcoded length

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13783): [Mantis/Technisat Cablestar HD2] Add support for the Technisat Cable...
Marko Viitamaki [Fri, 4 Dec 2009 08:32:30 +0000 (05:32 -0300)]
V4L/DVB (13783): [Mantis/Technisat Cablestar HD2] Add support for the Technisat Cablestar HD2

Signed-off-by: Marko Viitamaki <mau2@suomi24.fi>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
11 years agoV4L/DVB (13782): [Mantis] Temporarily disable FRDA irq
Manu Abraham [Fri, 4 Dec 2009 08:31:45 +0000 (05:31 -0300)]
V4L/DVB (13782): [Mantis] Temporarily disable FRDA irq

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>