linux-toradex.git/drivers/dma/imx-dma.c, branch v3.2.17

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-07T03:44:47+00:00

* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include 
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include 
  net: sch_generic remove redundant use of 
  net: inet_timewait_sock doesnt need 
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h

drivers/dma: Add module.h to files implicitly using it.

2011-10-31T23:31:44+00:00

Fix files that were implicitly using module.h but not
calling it out for inclusion directly.  We'll break those
once we remove the implicit presence otherwise

[With input from Uwe Kleine-König ]

Signed-off-by: Paul Gortmaker

dmaengine i.MX DMA/SDMA: add missing include of linux/module.h

2011-09-21T05:59:19+00:00

Add missing include of linux/module.h to fix build error.

Signed-off-by: Axel Lin 
Acked-by: Wolfram Sang 
Signed-off-by: Vinod Koul

ARM i.MX dma: Fix burstsize settings

2011-07-07T07:55:50+00:00

dmaengine expects the maxburst parameter in words, not bytes.
The imxdma driver and its users do this wrong. Fix this.

As a side note the imx-pcm-dma-mx2 driver was 'fixed' to work
with imx-dma. This broke the driver with imx-sdma support which
correctly takes the maxburst parameter in words. This patch
puts the sdma based sound back to work.

Signed-off-by: Sascha Hauer

dmaengine i.MX dma: initialize dma capabilities outside channel loop

2011-01-31T11:36:23+00:00

The capabilities are device specific fields, not channel specific fields.

Signed-off-by: Sascha Hauer

dmaengine i.MX DMA: do not initialize chan_id field

2011-01-31T11:36:10+00:00

Signed-off-by: Sascha Hauer

dmaengine i.MX dma: check sg entries for valid addresses and lengths

2011-01-31T11:36:02+00:00

Signed-off-by: Sascha Hauer

dmaengine i.MX dma: set maximum segment size for our device

2011-01-31T11:35:52+00:00

Signed-off-by: Sascha Hauer

dma: imx-dma: fix imxdma_probe error path

2010-12-03T09:39:03+00:00

otherwise, i will be -1 inside the latest iteration of the while loop.

Signed-off-by: Axel Lin 
Acked-by: Sascha Hauer 
Signed-off-by: Dan Williams

dma: imx-dma: fix signedness bug

2010-10-22T18:08:27+00:00

mxdmac->channel was unsigned, so check (imxdmac->channel < 0) for
failed imx_dma_request_by_prio() made no sence.  Explicitly check
signed values.
Also, fix uninitialzed use of ret.

Signed-off-by: Vasiliy Kulikov 
Signed-off-by: Sascha Hauer 
Signed-off-by: Dan Williams