diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 16:51:11 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 16:51:11 +0200 |
| commit | 26625ddadbe9cd5791c9d64b0425821b036c5188 (patch) | |
| tree | 5fbf9b50f99fb3163cd43d85039a1b8b0adf1243 /arch/arm/plat-samsung | |
| parent | 3d0c872ab4fbef94cf06e53e7a7b06357459e21b (diff) | |
| parent | 5ddfa8428b9f21453b1160846143e0b50d51b27c (diff) | |
| download | op-kernel-dev-26625ddadbe9cd5791c9d64b0425821b036c5188.zip op-kernel-dev-26625ddadbe9cd5791c9d64b0425821b036c5188.tar.gz | |
Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc2
* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Support Suspend/Resume for EXYNOS4412
ARM: EXYNOS: To use common config for EXYNOS4 and EXYNOS5 SPI
ARM: EXYNOS: Support DMA for EXYNOS5250 SoC
ARM: EXYNOS: Add platform resource definitions for FIMC-LITE
ARM: EXYNOS: add platform device for core DRM subsystem
ARM: EXYNOS: add dts files to dtbs target
spi/s3c64xx: Allow usage for ARCH_S3C24XX
ARM: S3C24XX: Add HSSPI setup callback for s3c64xx-spi driver
ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi
ARM: S3C24XX: Add map entries needed by the s3c64xx-spi devices
ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443
ARM: S3C24XX: Add forgotten clock lookup table to S3C2443
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index a0ffc77d..77e65b4 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -291,7 +291,7 @@ config S3C_DMA config SAMSUNG_DMADEV bool select DMADEVICES - select PL330_DMA if (CPU_EXYNOS4210 || CPU_S5PV210 || CPU_S5PC100 || \ + select PL330_DMA if (ARCH_EXYNOS5 || ARCH_EXYNOS4 || CPU_S5PV210 || CPU_S5PC100 || \ CPU_S5P6450 || CPU_S5P6440) select ARM_AMBA help diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 4067d1d..61ca2f3 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@ -134,6 +134,8 @@ extern struct platform_device exynos4_device_pcm2; extern struct platform_device exynos4_device_pd[]; extern struct platform_device exynos4_device_spdif; +extern struct platform_device exynos_device_drm; + extern struct platform_device samsung_asoc_dma; extern struct platform_device samsung_asoc_idma; extern struct platform_device samsung_device_keypad; diff --git a/arch/arm/plat-samsung/include/plat/dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h index 0670f37..d384a80 100644 --- a/arch/arm/plat-samsung/include/plat/dma-pl330.h +++ b/arch/arm/plat-samsung/include/plat/dma-pl330.h @@ -90,6 +90,7 @@ enum dma_ch { DMACH_MIPI_HSI5, DMACH_MIPI_HSI6, DMACH_MIPI_HSI7, + DMACH_DISP1, DMACH_MTOM_0, DMACH_MTOM_1, DMACH_MTOM_2, |
