linux.git/arch/arm/include/asm/hardware, branch v2.6.35 Linux kernel source tree Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel 2010-05-17T10:53:39+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-05-17T10:52:31+00:00 c39e52a793f5599582dbacf4d8f62634a492f79e Conflicts: arch/arm/Makefile arch/arm/common/Makefile arch/arm/mm/Kconfig 
Conflicts:
	arch/arm/Makefile
	arch/arm/common/Makefile
	arch/arm/mm/Kconfig
ARM: 6132/1: PL330: Add common core driver 2010-05-15T14:03:50+00:00 Jassi Brar jassisinghbrar@gmail.com 2010-05-14T14:18:54+00:00 75070612c49c0bb976bb9221d051b20316ad1bc7 PL330 is a configurable DMA controller PrimeCell device. The register map of the device is well defined. The configuration of a particular implementation can be read from the six configuration registers CR0-4,Dn. This patch implements a driver for the specification:- http://infocenter.arm.com/help/topic/com.arm.doc.ddi0424a/DDI0424A_dmac_pl330_r0p0_trm.pdf The exported interface should be sufficient to implement a driver for any DMA API. Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
PL330 is a configurable DMA controller PrimeCell device.
The register map of the device is well defined.
The configuration of a particular implementation can be
read from the six configuration registers CR0-4,Dn.

This patch implements a driver for the specification:-
http://infocenter.arm.com/help/topic/com.arm.doc.ddi0424a/DDI0424A_dmac_pl330_r0p0_trm.pdf

The exported interface should be sufficient to implement
a driver for any DMA API.

Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310 2010-05-15T14:03:50+00:00 Jason McMullan jason.mcmullan@gmail.com 2010-05-05T17:59:37+00:00 64039be8226b9f6c80c704d94ac9891eee4a274c The L310 cache controller's interface is almost identical to the L210. One major difference is that the PL310 can have up to 16 ways. This change uses the cache's part ID and the Associativity bits in the AUX_CTRL register to determine the number of ways. Also, this version prints out the CACHE_ID and AUX_CTRL registers. Acked-by: Will Deacon <will.deacon@arm.com> Acked-by: Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Jason S. McMullan <jason.mcmullan@netronome.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
The L310 cache controller's interface is almost identical
to the L210. One major difference is that the PL310 can
have up to 16 ways.

This change uses the cache's part ID and the Associativity
bits in the AUX_CTRL register to determine the number of ways.

Also, this version prints out the CACHE_ID and AUX_CTRL registers.

Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Jason S. McMullan <jason.mcmullan@netronome.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: ICST: kill duplicate icst code 2010-05-02T08:35:33+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-01-16T20:16:10+00:00 c5a0adb51002e51a4254cb7f0ab7190d41d8b930 The only difference between ICST307 and ICST525 are the two arrays for calculating the S parameter; the code is now identical. Merge the two files and kill the duplicated code. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
The only difference between ICST307 and ICST525 are the two arrays
for calculating the S parameter; the code is now identical.  Merge
the two files and kill the duplicated code.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: ICST: indirect s2div and idx2s arrays via icst_params 2010-05-02T08:35:32+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-01-16T19:46:19+00:00 232eaf7f268f765b52170bec42bfa0c5825aa239 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: ICST: move minimum VCO frequency to icst_params 2010-05-02T08:35:31+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-01-16T19:49:39+00:00 e73a46a3d3df22b379d8adcb59999eafea1d60d5 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: ICST: use Hz instead of kHz 2010-05-02T08:35:31+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-01-16T17:28:44+00:00 64fceb1dcd1aa6a9f2e53cf8830b38bb007b375b This makes the ICST support fit more nicely with the clk API, eliminating the need to *1000 and /1000 in places. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
This makes the ICST support fit more nicely with the clk API,
eliminating the need to *1000 and /1000 in places.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: ICST: provide definitions for max/min VCO frequencies 2010-05-02T08:35:30+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-01-16T18:08:47+00:00 4de2edbd15ff70c77e1d018611d06f7801fc2b72 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: ICST: icst.*_ps_to_vco() functions are unused, remove them 2010-05-02T08:35:30+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-01-16T17:15:07+00:00 643761ac43dfe4bea1195e966fc65a9403cdcb9f These functions were originally implemented for the CLCD driver before we had clk API support. Since the CLCD driver does not use these anymore, we can remove them. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
These functions were originally implemented for the CLCD driver before
we had clk API support.  Since the CLCD driver does not use these
anymore, we can remove them.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: ICST: merge common ICST VCO structures 2010-05-02T08:35:29+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-01-16T16:27:28+00:00 39c0cb02db5b8fdfac76d506b7a008b70bc960e9 The structures for the ICST307 and ICST525 VCO devices are identical, so merge them together. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
The structures for the ICST307 and ICST525 VCO devices are
identical, so merge them together.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>