From: Arnd Bergmann Date: Tue, 17 Jul 2012 21:06:32 +0000 (+0200) Subject: Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=feb7b8d6d2b2eedbca5a55b5dc74d9d967c91151;p=linux-beck.git Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt From Kukjin Kim : It is for supporting spi dt for exynos4210 and exynos5250, and got the ack from Grant Likely for spi driver. Note: Since this is including spi driver changes, so it was made based on next/devel-dma-ops which touches same file, Samsung spi driver for avoiding bad conflicts. * 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5 ARM: EXYNOS: Add spi clock support for EXYNOS5 ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4 ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock ARM: EXYNOS: Add device tree node for EXYNOS4 interrupt combiner controller spi: s3c64xx: add device tree support spi: s3c64xx: Remove the 'set_level' callback from controller data ARM: SAMSUNG: Modify s3c64xx_spi{0|1|2}_set_platdata function ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions spi: s3c64xx: move controller information into driver data spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro ARM: S3C64XX: Add a new dma request id for device tree based dma channel lookup Signed-off-by: Arnd Bergmann --- feb7b8d6d2b2eedbca5a55b5dc74d9d967c91151