summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-17 23:06:32 +0200
committerArnd Bergmann <arnd@arndb.de>2012-07-17 23:06:32 +0200
commitfeb7b8d6d2b2eedbca5a55b5dc74d9d967c91151 (patch)
treeed2bae5b1a496471924792608ddbaa2ff942812d /arch/arm/mach-ux500
parent6a1d02d861a35295db8b57fe4cd400bde7c8bd92 (diff)
parent79989ba3e201f3bf992e600a0745ecaf256f08f5 (diff)
downloadop-kernel-dev-feb7b8d6d2b2eedbca5a55b5dc74d9d967c91151.zip
op-kernel-dev-feb7b8d6d2b2eedbca5a55b5dc74d9d967c91151.tar.gz
Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
From Kukjin Kim <kgene.kim@samsung.com>: 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 <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud