linux-kernel - [GIT PULL] slave-dmaengine updates for 3.7

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:	Tue, 09 Oct 2012 09:11:03 +0530
From:	Vinod Koul <vinod.koul@...ux.intel.com>
To:	Linus <torvalds@...ux-foundation.org>
Cc:	Dan Williams <djbw@...com>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: [GIT PULL] slave-dmaengine updates for 3.7

Hi Linus,

Here is the slave-dmaengine update for 3.7

This time we have Andy updates on dw_dmac which is attempting to make
this IP block available as PCI and platform device though not fully
complete this time.
We also have TI EDMA moving the dma driver to use dmaengine APIs, also
have a new driver for mmp-tdma, along with bunch of small updates.

Now for your excitement the merge is little unusual here, while merging
the auto merge on linux-next picks wrong choice for pl330
(drivers/dma/pl330.c) and this causes build failure. The correct
resolution is in linux-next. (DMA: PL330: Fix build error)
I didn't back merge your tree this time as you are better than me so no
point in doing that for me :)


The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:

are available in the git repository at:

  git://git.infradead.org/users/vkoul/slave-dma.git next

Andy Shevchenko (9):
      dw_dmac: use devm_* functions to simplify code
      dw_dmac: utilize slave_id to pass request line
      dw_dmac: mark dwc_dump_chan_regs as inline
      dw_dmac: fill optional encoded parameters in register structure
      dw_dmac: get number of channels from hardware if possible
      dw_dmac: autoconfigure block_size or use platform data
      dw_dmac: autoconfigure data_width or get it via platform data
      dw_dmac: introduce software emulation of LLP transfers
      dw_dmac: fix a regression in dwc_prep_dma_memcpy

Dave Jiang (1):
      ioat: Adding Ivy Bridge IOATDMA PCI device IDs

Fabio Estevam (1):
      dma: imx-dma: Fix kernel crash due to missing clock conversion

Inderpal Singh (3):
      DMA: PL330: Remove controller clock enable/disable
      DMA: PL330: Remove redundant runtime_suspend/resume functions
      DMA: PL330: return ENOMEM instead of 0 from pl330_alloc_chan_resources

Julia Lawall (2):
      drivers/dma/sirf-dma.c: fix usage of devm functions
      drivers/dma/amba-pl08x.c: fix error return code

Laxman Dewangan (2):
      dma: tegra: enable/disable dma clock
      dma: tegra: fix interrupt name issue with apb dma.

Marek Vasut (1):
      mxs/dma: Enlarge the CCW descriptor area to 4 pages

Matt Porter (3):
      dmaengine: add TI EDMA DMA engine driver
      mmc: davinci_mmc: convert to DMA engine API
      spi: spi-davinci: convert to DMA engine API

Tushar Behera (2):
      ARM: EXYNOS: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
      DMA: PL330: Set the capability of pdm0 and pdm1 as DMA_PRIVATE

Ulf Hansson (1):
      dma/ste_dma40: Fixup clock usage during probe

Vinod Koul (3):
      Merge branch 'for-3.7' into next
      Merge branch 'fixes_for-3.6' into next
      spi: davici - make davinci select edma

Wei Yongjun (2):
      dma: tegra: use list_move_tail instead of list_del/list_add_tail
      dmaengine: use kmem_cache_zalloc instead of kmem_cache_alloc/memset

Zhangfei Gao (2):
      dmaengine: mmp-pdma support
      dmaengine: mmp_tdma: add dt support

 arch/arm/mach-exynos/dma.c            |    2 +
 arch/arm/mach-spear13xx/spear13xx.c   |    3 +
 arch/avr32/mach-at32ap/at32ap700x.c   |    3 +
 drivers/dma/Kconfig                   |   17 +
 drivers/dma/Makefile                  |    2 +
 drivers/dma/amba-pl08x.c              |    2 +
 drivers/dma/dw_dmac.c                 |  258 +++++++---
 drivers/dma/dw_dmac_regs.h            |   48 ++-
 drivers/dma/edma.c                    |  671 +++++++++++++++++++++++++
 drivers/dma/imx-dma.c                 |   36 +-
 drivers/dma/ioat/dma_v2.c             |    3 +-
 drivers/dma/ioat/pci.c                |   22 +
 drivers/dma/mmp_pdma.c                |  875 +++++++++++++++++++++++++++++++++
 drivers/dma/mmp_tdma.c                |   51 ++-
 drivers/dma/mxs-dma.c                 |   14 +-
 drivers/dma/pl330.c                   |   76 +---
 drivers/dma/sirf-dma.c                |   23 +-
 drivers/dma/ste_dma40.c               |   14 +-
 drivers/dma/tegra20-apb-dma.c         |   30 +-
 drivers/mmc/host/davinci_mmc.c        |  271 +++-------
 drivers/spi/Kconfig                   |    1 +
 drivers/spi/spi-davinci.c             |  292 +++++------
 include/linux/dw_dmac.h               |    7 +
 include/linux/edma.h                  |   29 ++
 include/linux/platform_data/mmp_dma.h |   19 +
 25 files changed, 2208 insertions(+), 561 deletions(-)
 create mode 100644 drivers/dma/edma.c
 create mode 100644 drivers/dma/mmp_pdma.c
 create mode 100644 include/linux/edma.h
 create mode 100644 include/linux/platform_data/mmp_dma.h

-- 
~Vinod

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)