linux-stable.git/drivers/dma/dw_dmac.c, branch linux-3.9.y

dw_dmac: adjust slave_id accordingly to request line base

2013-03-29T23:04:07+00:00

On some hardware configurations we have got the request line with the offset.
The patch introduces convert_slave_id() helper for that cases. The request line
base is came from the driver data provided by the platform_device_id table.

Signed-off-by: Mika Westerberg 
Signed-off-by: Andy Shevchenko 
Cc: Viresh Kumar 
Acked-by: Viresh Kumar 
Signed-off-by: Vinod Koul

dmaengine: dw_dma: fix endianess for DT xlate function

2013-03-29T23:04:07+00:00

As reported by Wu Fengguang's build robot tracking sparse warnings, the
dma_spec arguments in the dw_dma_xlate are already byte swapped on
little-endian platforms and must not get swapped again. This code is
currently not used anywhere, but will be used in Linux 3.10 when the
ARM SPEAr platform starts using the generic DMA DT binding.

Signed-off-by: Arnd Bergmann 
Reported-by: Fengguang Wu 
Acked-by: Viresh Kumar 
Signed-off-by: Vinod Koul

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-03-03T18:20:22+00:00

Pull second set of slave-dmaengine updates from Vinod Koul:
 "Arnd's patch moves the dw_dmac to use generic DMA binding.  I agreed
  to merge this late as it will avoid the conflicts between trees.

  The second patch from Matt adding a dma_request_slave_channel_compat
  API was supposed to be picked up, but somehow never got picked up.
  Some patches dependent on this are already in -next :("

* 'next' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: dw_dmac: move to generic DMA binding
  dmaengine: add dma_request_slave_channel_compat()

dmaengine: dw_dmac: move to generic DMA binding

2013-02-28T04:23:21+00:00

The original device tree binding for this driver, from Viresh Kumar
unfortunately conflicted with the generic DMA binding, and did not allow
to completely seperate slave device configuration from the controller.

This is an attempt to replace it with an implementation of the generic
binding, but it is currently completely untested, because I do not have
any hardware with this particular controller.

The patch applies on top of the slave-dma tree, which contains both the base
support for the generic DMA binding, as well as the earlier attempt from
Viresh. Both of these are currently not merged upstream however.

This version incorporates feedback from Viresh Kumar, Andy Shevchenko
and Russell King.

Signed-off-by: Arnd Bergmann 
Acked-by: Viresh Kumar 
Acked-by: Andy Shevchenko 
Cc: Vinod Koul 
Cc: devicetree-discuss@lists.ozlabs.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Vinod Koul

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-02-26T17:24:48+00:00

Pull slave-dmaengine updates from Vinod Koul:
 "This is fairly big pull by my standards as I had missed last merge
  window.  So we have the support for device tree for slave-dmaengine,
  large updates to dw_dmac driver from Andy for reusing on different
  architectures.  Along with this we have fixes on bunch of the drivers"

Fix up trivial conflicts, usually due to #include line movement next to
each other.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
  Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
  ARM: dts: pl330: Add #dma-cells for generic dma binding support
  DMA: PL330: Register the DMA controller with the generic DMA helpers
  DMA: PL330: Add xlate function
  DMA: PL330: Add new pl330 filter for DT case.
  dma: tegra20-apb-dma: remove unnecessary assignment
  edma: do not waste memory for dma_mask
  dma: coh901318: set residue only if dma is in progress
  dma: coh901318: avoid unbalanced locking
  dmaengine.h: remove redundant else keyword
  dma: of-dma: protect list write operation by spin_lock
  dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
  dma: of-dma.c: fix memory leakage
  dw_dmac: apply default dma_mask if needed
  dmaengine: ioat - fix spare sparse complain
  dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
  ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
  dw_dmac: add support for Lynxpoint DMA controllers
  dw_dmac: return proper residue value
  dw_dmac: fill individual length of descriptor
  ...

dw_dmac: apply default dma_mask if needed

2013-02-14T09:44:36+00:00

In some cases we got the device without dma_mask configured. We have to apply
the default value to avoid crashes during memory mapping.

Signed-off-by: Andy Shevchenko 
Acked-by: Viresh Kumar 
Signed-off-by: Vinod Koul

dw_dmac: add support for Lynxpoint DMA controllers

2013-02-12T16:14:36+00:00

Intel Lynxpoint PCH Low Power Subsystem has DMA controller to support general
purpose serial buses like SPI, I2C, and HSUART. This controller is enumerated
from ACPI namespace with ACPI ID INTL9C60.

Signed-off-by: Mika Westerberg 
Signed-off-by: Andy Shevchenko 
Acked-by: Viresh Kumar 
Signed-off-by: Vinod Koul

dw_dmac: return proper residue value

2013-01-28T12:04:50+00:00

Currently the driver returns full length of the active descriptor which is
wrong. We have to go throught the active descriptor and substract the length of
each sent children in the chain from the total length along with the actual
data in the DMA channel registers.

The cyclic case is not handled by this patch due to len field in the descriptor
structure is left untouched by the original code.

Signed-off-by: Andy Shevchenko 
Acked-by: Viresh Kumar 
Signed-off-by: Vinod Koul

dw_dmac: fill individual length of descriptor

2013-01-28T12:04:42+00:00

It will be useful to have the length of the transfer in the descriptor. The
cyclic transfer functions remained untouched.

Signed-off-by: Andy Shevchenko 
Acked-by: Viresh Kumar 
Signed-off-by: Vinod Koul

dw_dmac: introduce total_len field in struct dw_desc

2013-01-28T12:04:36+00:00

By this new field we distinguish a total length of the chain and the individual
length of each descriptor in the chain.

Signed-off-by: Andy Shevchenko 
Acked-by: Viresh Kumar 
Signed-off-by: Vinod Koul