linux-stable.git/drivers/dma/sh, branch linux-3.13.y

rcar-hpbdma: initialise plane information when halted

2013-11-28T08:16:00+00:00

Plane information should be initialized when halted.
It may restart from the wrong plane without this patch.

Reviewed-by: Max Filippov 
Signed-off-by: Kuninori Morimoto 
Acked-by: Simon Horman 
Signed-off-by: Vinod Koul

rcar-hpbdma: fixup channel busy check for double plane

2013-11-28T08:16:00+00:00

The device busy check method is different between
single and double planes.
It will always return "busy" without this patch
if channel used as double plane.

Reviewed-by: Max Filippov 
Signed-off-by: Kuninori Morimoto 
Acked-by: Simon Horman 
Signed-off-by: Vinod Koul

rcar-hpbdma: add max transfer size

2013-11-28T08:15:59+00:00

shdma_chan_probe() can set max transfer size,
but it will be PAGE_SIZE with out this patch.

Reviewed-by: Max Filippov 
Signed-off-by: Kuninori Morimoto 
Acked-by: Simon Horman 
Signed-off-by: Vinod Koul

Merge branch 'dma_complete' into next

2013-10-30T10:12:19+00:00

Merge branch 'for-linus' into next

2013-10-30T07:37:18+00:00

Conflicts:
	drivers/dma/edma.c
Moved the memory leak fix post merge

Signed-off-by: Vinod Koul

dmaengine: sh: use DMA_COMPLETE for dma completion status

2013-10-25T05:46:14+00:00

Acked-by: Dan Williams 
Acked-by: Linus Walleij 
Signed-off-by: Vinod Koul

dma: misc: remove deprecated IRQF_DISABLED

2013-10-13T14:51:35+00:00

This patch proposes to remove the use of the IRQF_DISABLED flag

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker 
Signed-off-by: Vinod Koul

rcar-hpbdma: add parameter to set_slave() method

2013-10-11T01:54:36+00:00

Commit 4981c4dc194efb18f0e9a02f1b43e926f2f0d2bb (DMA: shdma: switch DT mode to
use configuration data from a match table) added a new parameter to set_slave()
method but unfortunately got merged later than commit c4f6c41ba790bbbfcebb4c47a
(dma: add driver for R-Car HPB-DMAC), so that the HPB-DMAC driver retained the
old prototype which caused this warning:

drivers/dma/sh/rcar-hpbdma.c:485: warning: initialization from incompatible
pointer type

The newly added parameter  is used to override DMA slave address from 'struct
hpb_dmae_slave_config', so we have to add the 'slave_addr' field to 'struct
hpb_dmae_chan', conditionally assign it in set_slave() method, and return in
slave_addr() method.

Signed-off-by: Sergei Shtylyov 
Tested-by: Simon Horman 
Signed-off-by: Vinod Koul

rcar-hpbdma: remove shdma_free_irq() calls

2013-10-11T01:54:35+00:00

Commit c1c63a14f4f2419d093acd7164eccdff315baa86 (DMA: shdma: switch to managed
resource allocation) got rid of shdma_free_irq() but  unfortunately got merged
later than commit c4f6c41ba790bbbfcebb4c47a709ac8ff1fe1af9 (dma: add driver for
R-Car HPB-DMAC), so that the HPB-DMAC driver retained the calls and got broken:

drivers/dma/sh/rcar-hpbdma.c: In function `hpb_dmae_alloc_chan_resources':
drivers/dma/sh/rcar-hpbdma.c:435: error: implicit declaration of function
`shdma_free_irq'

Fix this compilation error by removing the remaining shdma_free_irq() calls.

Reported-by: Simon Horman 
Signed-off-by: Sergei Shtylyov 
Tested-by: Simon Horman 
Signed-off-by: Vinod Koul

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

2013-09-10T20:37:36+00:00

Pull slave-dmaengine updates from Vinod Koul:
 "This pull brings:
   - Andy's DW driver updates
   - Guennadi's sh driver updates
   - Pl08x driver fixes from Tomasz & Alban
   - Improvements to mmp_pdma by Daniel
   - TI EDMA fixes by Joel
   - New drivers:
     - Hisilicon k3dma driver
     - Renesas rcar dma driver
  - New API for publishing slave driver capablities
  - Various fixes across the subsystem by Andy, Jingoo, Sachin etc..."

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (94 commits)
  dma: edma: Remove limits on number of slots
  dma: edma: Leave linked to Null slot instead of DUMMY slot
  dma: edma: Find missed events and issue them
  ARM: edma: Add function to manually trigger an EDMA channel
  dma: edma: Write out and handle MAX_NR_SG at a given time
  dma: edma: Setup parameters to DMA MAX_NR_SG at a time
  dmaengine: pl330: use dma_set_max_seg_size to set the sg limit
  dmaengine: dma_slave_caps: remove sg entries
  dma: replace devm_request_and_ioremap by devm_ioremap_resource
  dma: ste_dma40: Fix potential null pointer dereference
  dma: ste_dma40: Remove duplicate const
  dma: imx-dma: Remove redundant NULL check
  dma: dmagengine: fix function names in comments
  dma: add driver for R-Car HPB-DMAC
  dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
  dma: imx-sdma: Staticize sdma_driver_data structures
  pch_dma: Add MODULE_DEVICE_TABLE
  dmaengine: PL08x: Add cyclic transfer support
  dmaengine: PL08x: Fix reading the byte count in cctl
  dmaengine: PL08x: Add support for different maximum transfer size
  ...