From: Olof Johansson Date: Mon, 28 Oct 2013 04:42:44 +0000 (-0700) Subject: Merge tag 's3c24xx-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... X-Git-Tag: v3.13-rc1~157^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3316dee245ef297155fa45b8d14263dfd6a9164b;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge tag 's3c24xx-dma' of git://git./linux/kernel/git/kgene/linux-samsung into next/drivers From Kukjin Kim, this branch adds device-tree support to the DMA controller on the older Samsung SoCs. It also adds support for one of the missing SoCs in the family (2410). The driver has been Ack:ed by Vinod Koul, but is merged through here due to dependencies with platform code. * tag 's3c24xx-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: add dma pdata for s3c2410, s3c2440 and s3c2442 dmaengine: s3c24xx-dma: add support for the s3c2410 type of controller ARM: S3C24XX: Fix possible dma selection warning ARM: SAMSUNG: set s3c24xx_dma_filter for s3c64xx-spi0 device ARM: S3C24XX: add platform-devices for new dma driver for s3c2412 and s3c2443 dmaengine: add driver for Samsung s3c24xx SoCs ARM: S3C24XX: number the dma clocks + Linux 3.12-rc3 Signed-off-by: Olof Johansson --- 3316dee245ef297155fa45b8d14263dfd6a9164b