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/mach-exynos/Kconfig | |
| parent | Merge branch 'exynos/iommu' into next/soc2 (diff) | |
| parent | ARM: EXYNOS: Support Suspend/Resume for EXYNOS4412 (diff) | |
| download | linux-26625ddadbe9cd5791c9d64b0425821b036c5188.tar.xz linux-26625ddadbe9cd5791c9d64b0425821b036c5188.zip | |
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/mach-exynos/Kconfig')
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index d3e54cbe14cf..5893e2397da1 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -61,6 +61,7 @@ config SOC_EXYNOS5250 bool "SAMSUNG EXYNOS5250" default y depends on ARCH_EXYNOS5 + select SAMSUNG_DMADEV help Enable EXYNOS5250 SoC support @@ -70,7 +71,7 @@ config EXYNOS4_MCT help Use MCT (Multi Core Timer) as kernel timers -config EXYNOS4_DEV_DMA +config EXYNOS_DEV_DMA bool help Compile in amba device definitions for DMA controller @@ -80,6 +81,11 @@ config EXYNOS4_DEV_AHCI help Compile in platform device definitions for AHCI +config EXYNOS_DEV_DRM + bool + help + Compile in platform device definitions for core DRM device + config EXYNOS4_SETUP_FIMD0 bool help @@ -161,7 +167,7 @@ config EXYNOS4_SETUP_USB_PHY help Common setup code for USB PHY controller -config EXYNOS4_SETUP_SPI +config EXYNOS_SETUP_SPI bool help Common setup code for SPI GPIO configurations. @@ -223,7 +229,7 @@ config MACH_ARMLEX4210 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 select EXYNOS4_DEV_AHCI - select EXYNOS4_DEV_DMA + select EXYNOS_DEV_DMA select EXYNOS4_SETUP_SDHCI help Machine support for Samsung ARMLEX4210 based on EXYNOS4210 @@ -350,7 +356,7 @@ config MACH_SMDK4212 select SAMSUNG_DEV_KEYPAD select SAMSUNG_DEV_PWM select EXYNOS_DEV_SYSMMU - select EXYNOS4_DEV_DMA + select EXYNOS_DEV_DMA select EXYNOS4_SETUP_I2C1 select EXYNOS4_SETUP_I2C3 select EXYNOS4_SETUP_I2C7 |