07 Nov, 2011

1 commit

  • * '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

    Linus Torvalds
     

01 Nov, 2011

1 commit


21 Sep, 2011

1 commit


07 Jul, 2011

1 commit

  • 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

    Sascha Hauer
     

31 Jan, 2011

4 commits


03 Dec, 2010

1 commit


23 Oct, 2010

1 commit

  • 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

    Sascha Hauer
     

08 Oct, 2010

1 commit

  • This driver is currently implemented as a user to the old i.MX
    DMA API. This allows us to convert each user of the old API to
    the dmaengine API one by one. Once this is done the old DMA
    driver can be merged into the i.MX dmaengine driver.

    V2: remove some debug leftovers and unused variables

    Signed-off-by: Sascha Hauer
    Acked-by: Linus Walleij
    Signed-off-by: Dan Williams

    Sascha Hauer