Merge branch 'topic/sprd' into for-linus

* Spreadtrum DMA controller

This binding follows the generic DMA bindings defined in dma.txt.

Required properties:

- compatible: Should be "sprd,sc9860-dma".

- reg: Should contain DMA registers location and length.

- interrupts: Should contain one interrupt shared by all channel.

- #dma-cells: must be <1>. Used to represent the number of integer

	cells in the dmas property of client device.

- #dma-channels : Number of DMA channels supported. Should be 32.

- clock-names: Should contain the clock of the DMA controller.

- clocks: Should contain a clock specifier for each entry in clock-names.

Example:

Controller:

apdma: dma-controller@20100000 {

	compatible = "sprd,sc9860-dma";

	reg = <0x20100000 0x4000>;

	interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;

	#dma-cells = <1>;

	#dma-channels = <32>;

	clock-names = "enable";

	clocks = <&clk_ap_ahb_gates 5>;

};

Client:

DMA clients connected to the Spreadtrum DMA controller must use the format

described in the dma.txt file, using a two-cell specifier for each channel.

The two cells in order are:

1. A phandle pointing to the DMA controller.

2. The channel id.

spi0: spi@70a00000{

	...

	dma-names = "rx_chn", "tx_chn";

	dmas = <&apdma 11>, <&apdma 12>;

	...

};

	  If you have a board based on STM32 SoC and wish to use the master DMA

	  say Y here.

config SPRD_DMA

	tristate "Spreadtrum DMA support"

	depends on ARCH_SPRD || COMPILE_TEST

	select DMA_ENGINE

	select DMA_VIRTUAL_CHANNELS

	help

	  Enable support for the on-chip DMA controller on Spreadtrum platform.

config S3C24XX_DMAC

	bool "Samsung S3C24XX DMA support"

	depends on ARCH_S3C24XX || COMPILE_TEST

obj-$(CONFIG_STM32_DMA) += stm32-dma.o

obj-$(CONFIG_STM32_DMAMUX) += stm32-dmamux.o

obj-$(CONFIG_STM32_MDMA) += stm32-mdma.o

obj-$(CONFIG_SPRD_DMA) += sprd-dma.o

obj-$(CONFIG_S3C24XX_DMAC) += s3c24xx-dma.o

obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o

obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o