linux-toradex.git/drivers/dma/ipu, branch v3.1.1

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

2011-08-01T23:46:37+00:00

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (37 commits)
  Improve slave/cyclic DMA engine documentation
  dmaengine: pl08x: handle the rest of enums in pl08x_width
  DMA: PL08x: cleanup selection of burst size
  DMA: PL08x: avoid recalculating cctl at each prepare
  DMA: PL08x: cleanup selection of buswidth
  DMA: PL08x: constify plchan->cd and plat->slave_channels
  DMA: PL08x: separately store source/destination cctl
  DMA: PL08x: separately store source/destination slave address
  DMA: PL08x: clean up LLI debugging
  DMA: PL08x: select LLI bus only once per LLI setup
  DMA: PL08x: remove unused constants
  ARM: mxs-dma: reset after disable channel
  dma: intel_mid_dma: remove redundant pci_set_drvdata calls
  dma: mxs-dma: fix unterminated platform_device_id table
  dmaengine: pl330: make platform data optional
  dmaengine: imx-sdma: return proper error if kzalloc fails
  pch_dma: Fix CTL register access issue
  dmaengine: mxs-dma: skip request_irq for NO_IRQ
  dmaengine/coh901318: fix slave submission semantics
  dmaengine/ste_dma40: allow memory buswidth/burst to be configured
  ...

Fix trivial whitespace conflict in drivers/dma/mv_xor.c

net: remove mm.h inclusion from netdevice.h

2011-06-22T02:17:20+00:00

Remove linux/mm.h inclusion from netdevice.h -- it's unused (I've checked manually).

To prevent mm.h inclusion via other channels also extract "enum dma_data_direction"
definition into separate header. This tiny piece is what gluing netdevice.h with mm.h
via "netdevice.h => dmaengine.h => dma-mapping.h => scatterlist.h => mm.h".
Removal of mm.h from scatterlist.h was tried and was found not feasible
on most archs, so the link was cutoff earlier.

Hope people are OK with tiny include file.

Note, that mm_types.h is still dragged in, but it is a separate story.

Signed-off-by: Alexey Dobriyan 
Signed-off-by: David S. Miller

dma: ipu_idmac.c: use resource_size in ioremap

2011-06-06T08:13:59+00:00

Signed-off-by: H Hartley Sweeten 
Cc: Dan Williams 
Cc: Vinod Koul 
Cc: Guennadi Liakhovetski 
Cc: Anatolij Gustschin 
Signed-off-by: Vinod Koul

dma: Ipu: Convert interupt code

2011-03-25T21:09:00+00:00

Convert to the new irq chip functions and cleanup the name space.

[ Guennadi reported: irq_data_get_chip_data is undefined. Yes, I screwed up. 
 it needs to be irq_data_get_irq_chip_data ]

Signed-off-by: Thomas Gleixner 
Tested-by: Guennadi Liakhovetski 
Cc: Dan Williams 
LKML-Reference:

dma: ipu_idmac: do not lose valid received data in the irq handler

2011-02-14T10:28:16+00:00

Currently when two or more buffers are queued by the camera driver
and so the double buffering is enabled in the idmac, we lose one
frame comming from CSI since the reporting of arrival of the first
frame is deferred by the DMAIC_7_EOF interrupt handler and reporting
of the arrival of the last frame is not done at all. So when requesting
N frames from the image sensor we actually receive N - 1 frames in
user space.

The reason for this behaviour is that the DMAIC_7_EOF interrupt
handler misleadingly assumes that the CUR_BUF flag is pointing to the
buffer used by the IDMAC. Actually it is not the case since the
CUR_BUF flag will be flipped by the FSU when the FSU is sending the
_NEW_FRM_RDY signal when new frame data is delivered by the CSI.
When sending this singal, FSU updates the DMA_CUR_BUF and the
DMA_BUFx_RDY flags: the DMA_CUR_BUF is flipped, the DMA_BUFx_RDY
is cleared, indicating that the frame data is beeing written by
the IDMAC to the pointed buffer. DMA_BUFx_RDY is supposed to be
set to the ready state again by the MCU, when it has handled the
received data. DMAIC_7_CUR_BUF flag won't be flipped here by the
IPU, so waiting for this event in the EOF interrupt handler is wrong.
Actually there is no spurious interrupt as described in the comments,
this is the valid DMAIC_7_EOF interrupt indicating reception of the
frame from CSI.

The patch removes code that waits for flipping of the DMAIC_7_CUR_BUF
flag in the DMAIC_7_EOF interrupt handler. As the comment in the
current code denotes, this waiting doesn't help anyway. As a result
of this removal the reporting of the first arrived frame is not
deferred to the time of arrival of the next frame and the drivers
software flag 'ichan->active_buffer' is in sync with DMAIC_7_CUR_BUF
flag, so the reception of all requested frames works.

This has been verified on the hardware which is triggering the
image sensor by the programmable state machine, allowing to
obtain exact number of frames. On this hardware we do not tolerate
losing frames.

This patch also removes resetting the DMA_BUFx_RDY flags of
all channels in ipu_disable_channel() since transfers on other
DMA channels might be triggered by other running tasks and the
buffers should always be ready for data sending or reception.

Signed-off-by: Anatolij Gustschin 
Reviewed-by: Guennadi Liakhovetski 
Tested-by: Guennadi Liakhovetski 
Signed-off-by: Dan Williams

DMAENGINE: extend the control command to include an arg

2010-05-17T23:30:42+00:00

This adds an argument to the DMAengine control function, so that
we can later provide control commands that need some external data
passed in through an argument akin to the ioctl() operation
prototype.

[dan.j.williams@intel.com: fix up some missed conversions]
Signed-off-by: Linus Walleij 
Signed-off-by: Dan Williams

dmaengine: provide helper for setting txstate

2010-03-26T23:52:10+00:00

Simple conditional struct filler to cut out some duplicated code.

Signed-off-by: Dan Williams

DMAENGINE: generic channel status v2

2010-03-26T23:50:49+00:00

Convert the device_is_tx_complete() operation on the
DMA engine to a generic device_tx_status()operation which
can return three states, DMA_TX_RUNNING, DMA_TX_COMPLETE,
DMA_TX_PAUSED.

[dan.j.williams@intel.com: update for timberdale]
Signed-off-by: Linus Walleij 
Acked-by: Mark Brown 
Cc: Maciej Sosnowski 
Cc: Nicolas Ferre 
Cc: Pavel Machek 
Cc: Li Yang 
Cc: Guennadi Liakhovetski 
Cc: Paul Mundt 
Cc: Ralf Baechle 
Cc: Haavard Skinnemoen 
Cc: Magnus Damm 
Cc: Liam Girdwood 
Cc: Joe Perches 
Cc: Roland Dreier 
Signed-off-by: Dan Williams

DMAENGINE: generic slave control v2

2010-03-26T23:44:01+00:00

Convert the device_terminate_all() operation on the
DMA engine to a generic device_control() operation
which can now optionally support also pausing and
resuming DMA on a certain channel. Implemented for the
COH 901 318 DMAC as an example.

[dan.j.williams@intel.com: update for timberdale]
Signed-off-by: Linus Walleij 
Acked-by: Mark Brown 
Cc: Maciej Sosnowski 
Cc: Nicolas Ferre 
Cc: Pavel Machek 
Cc: Li Yang 
Cc: Guennadi Liakhovetski 
Cc: Paul Mundt 
Cc: Ralf Baechle 
Cc: Haavard Skinnemoen 
Cc: Magnus Damm 
Cc: Liam Girdwood 
Cc: Joe Perches 
Cc: Roland Dreier 
Signed-off-by: Dan Williams

Merge branch 'coh' into dmaengine

2010-03-04T04:22:21+00:00