* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
dmaengine/ep93xx_dma: add module.h include
pch_dma: Reduce wasting memory
pch_dma: Fix suspend issue
dma/timberdale: free_irq() on an error path
dma: shdma: transfer based runtime PM
dmaengine: shdma: protect against the IRQ handler
dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
serial: sh-sci: don't filter on DMA device, use only channel ID
ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
ASoC: Samsung: Update DMA interface
spi/s3c64xx: Merge dma control code
spi/s3c64xx: Add support DMA engine API
ARM: SAMSUNG: Remove S3C-PL330-DMA driver
ARM: S5P64X0: Use generic DMA PL330 driver
ARM: S5PC100: Use generic DMA PL330 driver
ARM: S5PV210: Use generic DMA PL330 driver
...
Fix up fairly trivial conflicts in
- arch/arm/mach-exynos4/{Kconfig,clock.c}
- arch/arm/mach-s5p64x0/dma.c
282 lines
5.3 KiB
Plaintext
282 lines
5.3 KiB
Plaintext
# arch/arm/mach-exynos4/Kconfig
|
|
#
|
|
# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
|
|
# http://www.samsung.com/
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
# Configuration options for the EXYNOS4
|
|
|
|
if ARCH_EXYNOS4
|
|
|
|
config CPU_EXYNOS4210
|
|
bool
|
|
select SAMSUNG_DMADEV
|
|
select ARM_CPU_SUSPEND if PM
|
|
help
|
|
Enable EXYNOS4210 CPU support
|
|
|
|
config SOC_EXYNOS4212
|
|
bool
|
|
help
|
|
Enable EXYNOS4212 SoC support
|
|
|
|
config SOC_EXYNOS4412
|
|
bool
|
|
help
|
|
Enable EXYNOS4412 SoC support
|
|
|
|
config EXYNOS4_MCT
|
|
bool
|
|
default y
|
|
help
|
|
Use MCT (Multi Core Timer) as kernel timers
|
|
|
|
config EXYNOS4_DEV_AHCI
|
|
bool
|
|
help
|
|
Compile in platform device definitions for AHCI
|
|
|
|
config EXYNOS4_SETUP_FIMD0
|
|
bool
|
|
help
|
|
Common setup code for FIMD0.
|
|
|
|
config EXYNOS4_DEV_PD
|
|
bool
|
|
help
|
|
Compile in platform device definitions for Power Domain
|
|
|
|
config EXYNOS4_DEV_SYSMMU
|
|
bool
|
|
help
|
|
Common setup code for SYSTEM MMU in EXYNOS4
|
|
|
|
config EXYNOS4_DEV_DWMCI
|
|
bool
|
|
help
|
|
Compile in platform device definitions for DWMCI
|
|
|
|
config EXYNOS4_SETUP_I2C1
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 1.
|
|
|
|
config EXYNOS4_SETUP_I2C2
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 2.
|
|
|
|
config EXYNOS4_SETUP_I2C3
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 3.
|
|
|
|
config EXYNOS4_SETUP_I2C4
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 4.
|
|
|
|
config EXYNOS4_SETUP_I2C5
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 5.
|
|
|
|
config EXYNOS4_SETUP_I2C6
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 6.
|
|
|
|
config EXYNOS4_SETUP_I2C7
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 7.
|
|
|
|
config EXYNOS4_SETUP_KEYPAD
|
|
bool
|
|
help
|
|
Common setup code for keypad.
|
|
|
|
config EXYNOS4_SETUP_SDHCI
|
|
bool
|
|
select EXYNOS4_SETUP_SDHCI_GPIO
|
|
help
|
|
Internal helper functions for EXYNOS4 based SDHCI systems.
|
|
|
|
config EXYNOS4_SETUP_SDHCI_GPIO
|
|
bool
|
|
help
|
|
Common setup code for SDHCI gpio.
|
|
|
|
config EXYNOS4_SETUP_FIMC
|
|
bool
|
|
help
|
|
Common setup code for the camera interfaces.
|
|
|
|
config EXYNOS4_SETUP_USB_PHY
|
|
bool
|
|
help
|
|
Common setup code for USB PHY controller
|
|
|
|
# machine support
|
|
|
|
menu "EXYNOS4 Machines"
|
|
|
|
comment "EXYNOS4210 Boards"
|
|
|
|
config MACH_SMDKC210
|
|
bool "SMDKC210"
|
|
select MACH_SMDKV310
|
|
help
|
|
Machine support for Samsung SMDKC210
|
|
|
|
config MACH_SMDKV310
|
|
bool "SMDKV310"
|
|
select CPU_EXYNOS4210
|
|
select S5P_DEV_FIMD0
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select EXYNOS4_DEV_AHCI
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select EXYNOS4_DEV_PD
|
|
select SAMSUNG_DEV_PWM
|
|
select EXYNOS4_DEV_SYSMMU
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_KEYPAD
|
|
select EXYNOS4_SETUP_SDHCI
|
|
help
|
|
Machine support for Samsung SMDKV310
|
|
|
|
config MACH_ARMLEX4210
|
|
bool "ARMLEX4210"
|
|
select CPU_EXYNOS4210
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select EXYNOS4_DEV_AHCI
|
|
select EXYNOS4_DEV_SYSMMU
|
|
select EXYNOS4_SETUP_SDHCI
|
|
help
|
|
Machine support for Samsung ARMLEX4210 based on EXYNOS4210
|
|
|
|
config MACH_UNIVERSAL_C210
|
|
bool "Mobile UNIVERSAL_C210 Board"
|
|
select CPU_EXYNOS4210
|
|
select S5P_GPIO_INT
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S5P_DEV_FIMC3
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C3
|
|
select S3C_DEV_I2C5
|
|
select S5P_DEV_MFC
|
|
select S5P_DEV_ONENAND
|
|
select EXYNOS4_DEV_PD
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_I2C3
|
|
select EXYNOS4_SETUP_I2C5
|
|
select EXYNOS4_SETUP_SDHCI
|
|
help
|
|
Machine support for Samsung Mobile Universal S5PC210 Reference
|
|
Board.
|
|
|
|
config MACH_NURI
|
|
bool "Mobile NURI Board"
|
|
select CPU_EXYNOS4210
|
|
select S3C_DEV_WDT
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C3
|
|
select S3C_DEV_I2C5
|
|
select S5P_DEV_MFC
|
|
select S5P_DEV_USB_EHCI
|
|
select EXYNOS4_DEV_PD
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_I2C3
|
|
select EXYNOS4_SETUP_I2C5
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_USB_PHY
|
|
select SAMSUNG_DEV_PWM
|
|
select SAMSUNG_DEV_ADC
|
|
help
|
|
Machine support for Samsung Mobile NURI Board.
|
|
|
|
config MACH_ORIGEN
|
|
bool "ORIGEN"
|
|
select CPU_EXYNOS4210
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S3C_DEV_HSMMC2
|
|
select EXYNOS4_SETUP_SDHCI
|
|
help
|
|
Machine support for ORIGEN based on Samsung EXYNOS4210
|
|
|
|
comment "EXYNOS4212 Boards"
|
|
|
|
config MACH_SMDK4212
|
|
bool "SMDK4212"
|
|
select SOC_EXYNOS4212
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C3
|
|
select S3C_DEV_I2C7
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select SAMSUNG_DEV_PWM
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_I2C3
|
|
select EXYNOS4_SETUP_I2C7
|
|
select EXYNOS4_SETUP_KEYPAD
|
|
select EXYNOS4_SETUP_SDHCI
|
|
help
|
|
Machine support for Samsung SMDK4212
|
|
|
|
comment "EXYNOS4412 Boards"
|
|
|
|
config MACH_SMDK4412
|
|
bool "SMDK4412"
|
|
select SOC_EXYNOS4412
|
|
select MACH_SMDK4212
|
|
help
|
|
Machine support for Samsung SMDK4412
|
|
|
|
endmenu
|
|
|
|
comment "Configuration for HSMMC bus width"
|
|
|
|
menu "Use 8-bit bus width"
|
|
|
|
config EXYNOS4_SDHCI_CH0_8BIT
|
|
bool "Channel 0 with 8-bit bus"
|
|
help
|
|
Support HSMMC Channel 0 8-bit bus.
|
|
If selected, Channel 1 is disabled.
|
|
|
|
config EXYNOS4_SDHCI_CH2_8BIT
|
|
bool "Channel 2 with 8-bit bus"
|
|
help
|
|
Support HSMMC Channel 2 8-bit bus.
|
|
If selected, Channel 3 is disabled.
|
|
|
|
endmenu
|
|
|
|
endif
|