Linus Torvalds
dcded10f6d
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
...
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (30 commits)
DMAENGINE: at_hdmac: locking fixlet
DMAENGINE: pch_dma: kill another usage of __raw_{read|write}l
dma: dmatest: fix potential sign bug
ioat2: catch and recover from broken vtd configurations v6
DMAENGINE: add runtime slave control to COH 901 318 v3
DMAENGINE: add runtime slave config to DMA40 v3
DMAENGINE: generic slave channel control v3
dmaengine: Driver for Topcliff PCH DMA controller
intel_mid: Add Mrst & Mfld DMA Drivers
drivers/dma: Eliminate a NULL pointer dereference
dma/timb_dma: compile warning on 32 bit
DMAENGINE: ste_dma40: support older silicon
DMAENGINE: ste_dma40: support disabling physical channels
DMAENGINE: ste_dma40: no disabled phy channels on ux500
DMAENGINE: ste_dma40: fix suspend bug
DMAENGINE: ste_dma40: add DB8500 memcpy channels
DMAENGINE: ste_dma40: no flow control on memcpy
DMAENGINE: ste_dma40: arch updates for LCLA and LCPA
DMAENGINE: ste_dma40: allocate LCLA dynamically
DMAENGINE: ste_dma40: no premature stop
...
Fix up trivial conflicts in arch/arm/mach-ux500/devices-db8500.c
2010-08-09 21:00:07 -07:00
Rabin Vincent
6055930cba
ARM: 6266/1: ux500: add separate irq lists for DB8500 and DB5500
...
Acked-by: Linus Walleij <linus.walleij@stericsson.com >
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com >
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2010-07-26 11:11:21 +01:00
Linus Walleij
f41855929c
DMAENGINE: ste_dma40: support older silicon
...
This makes sure the DMA40 driver will also work on the oldest
silicon revisions that have the on-chip memory on another location
in the DB8500 and also requires explicit suspend before starting
or resuming a logical channel.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com >
[added parenthesis to the definition of U8500_DMA_LCPA_BASE_ED]
Signed-off-by: Dan Williams <dan.j.williams@intel.com >
2010-06-22 18:06:42 -07:00
Jonas Aaberg
595167253a
DMAENGINE: ste_dma40: no disabled phy channels on ux500
...
Make sure we have no disabled physical channels when we start on
the ux500 machines.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com >
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com >
Signed-off-by: Dan Williams <dan.j.williams@intel.com >
2010-06-22 18:01:57 -07:00
Jonas Aaberg
8bc68fa51d
DMAENGINE: ste_dma40: add DB8500 memcpy channels
...
This adds all available memcpy channels to the DB8500 in the
ux500 platform (and fixes a typo).
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com >
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com >
Signed-off-by: Dan Williams <dan.j.williams@intel.com >
2010-06-22 18:01:56 -07:00
Jonas Aaberg
ef934aea86
DMAENGINE: ste_dma40: no flow control on memcpy
...
On memcpy DMA operations we don't need flow control.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com >
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com >
Signed-off-by: Dan Williams <dan.j.williams@intel.com >
2010-06-22 18:01:56 -07:00
Jonas Aaberg
5aa12e8c9c
DMAENGINE: ste_dma40: arch updates for LCLA and LCPA
...
This follows on the patch to allocate LCLA dynamically: the
on-chip memory is needed for other things so now that that
we're using it dynamically we can remove the LCLA resource
altogether and free up some ESRAM memory.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com >
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com >
Signed-off-by: Dan Williams <dan.j.williams@intel.com >
2010-06-22 18:01:55 -07:00
Linus Walleij
7b8ddb06e5
DMAENGINE: DMA40 U8500 platform configuration
...
This completes the DMA40 support with the platform-specific
configuration for U8500/DB8500.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com >
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com >
Reviewed-by: Alessandro Rubini <rubini@unipv.it >
Cc: STEricsson_nomadik_linux@list.st.com
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk >
[fixed up dma40_{tx|rx}_map declaration/initialization]
Signed-off-by: Dan Williams <dan.j.williams@intel.com >
2010-05-27 15:21:26 -07:00
Rabin Vincent
5b1f7ddf18
ARM: 6086/1: ux500: move gpio devices to devices-db8500.c
...
The GPIO layout is different on DB5500, so move the current one to
devices-db8500.c.
Acked-by: Linus Walleij <linus.walleij@stericsson.com >
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com >
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2010-05-04 17:50:04 +01:00
Rabin Vincent
f9faf23799
ARM: 6085/1: ux500: reorganize i2c devices
...
Move common i2c devices to devices.c and DB8500-specific I2C
devices to devices-db8500.c.
Acked-by: Linus Walleij <linus.walleij@stericsson.com >
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com >
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2010-05-04 17:50:04 +01:00
Rabin Vincent
9e4e7fe1a9
ARM: 6083/1: ux500: put DB8500-specific devices in devices-db8500.c
...
Add devices-db8500.c for DB8500-specific devices, starting
with SSP0.
Acked-by: Linus Walleij <linus.walleij@stericsson.com >
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com >
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2010-05-04 17:50:03 +01:00