fba9569924
* '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
175 lines
3.5 KiB
Text
175 lines
3.5 KiB
Text
# arch/arm/mach-s5pv210/Kconfig
|
|
#
|
|
# Copyright (c) 2010 Samsung Electronics Co., Ltd.
|
|
# http://www.samsung.com/
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
# Configuration options for the S5PV210/S5PC110
|
|
|
|
if ARCH_S5PV210
|
|
|
|
config CPU_S5PV210
|
|
bool
|
|
select SAMSUNG_DMADEV
|
|
select S5P_EXT_INT
|
|
select S5P_HRT
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
help
|
|
Enable S5PV210 CPU support
|
|
|
|
config S5PV210_SETUP_I2C1
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 1.
|
|
|
|
config S5PV210_SETUP_I2C2
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 2.
|
|
|
|
config S5PV210_SETUP_IDE
|
|
bool
|
|
help
|
|
Common setup code for S5PV210 IDE GPIO configurations
|
|
|
|
config S5PV210_SETUP_FB_24BPP
|
|
bool
|
|
help
|
|
Common setup code for S5PV210 with an 24bpp RGB display helper.
|
|
|
|
config S5PV210_SETUP_KEYPAD
|
|
bool
|
|
help
|
|
Common setup code for keypad.
|
|
|
|
config S5PV210_SETUP_SDHCI
|
|
bool
|
|
select S5PV210_SETUP_SDHCI_GPIO
|
|
help
|
|
Internal helper functions for S5PV210 based SDHCI systems
|
|
|
|
config S5PV210_SETUP_SDHCI_GPIO
|
|
bool
|
|
help
|
|
Common setup code for SDHCI gpio.
|
|
|
|
config S5PV210_SETUP_FIMC
|
|
bool
|
|
help
|
|
Common setup code for the camera interfaces.
|
|
|
|
menu "S5PC110 Machines"
|
|
|
|
config MACH_AQUILA
|
|
bool "Aquila"
|
|
select CPU_S5PV210
|
|
select S3C_DEV_FB
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S5P_DEV_ONENAND
|
|
select S5PV210_SETUP_FB_24BPP
|
|
select S5PV210_SETUP_SDHCI
|
|
help
|
|
Machine support for the Samsung Aquila target based on S5PC110 SoC
|
|
|
|
config MACH_GONI
|
|
bool "GONI"
|
|
select CPU_S5PV210
|
|
select S5P_GPIO_INT
|
|
select S3C_DEV_FB
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C2
|
|
select S5P_DEV_MFC
|
|
select S3C_DEV_USB_HSOTG
|
|
select S5P_DEV_ONENAND
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select S5P_DEV_TV
|
|
select S5PV210_SETUP_FB_24BPP
|
|
select S5PV210_SETUP_I2C1
|
|
select S5PV210_SETUP_I2C2
|
|
select S5PV210_SETUP_KEYPAD
|
|
select S5PV210_SETUP_SDHCI
|
|
select S5PV210_SETUP_FIMC
|
|
help
|
|
Machine support for Samsung GONI board
|
|
S5PC110(MCP) is one of package option of S5PV210
|
|
|
|
config MACH_SMDKC110
|
|
bool "SMDKC110"
|
|
select CPU_S5PV210
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C2
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select SAMSUNG_DEV_IDE
|
|
select S5PV210_SETUP_I2C1
|
|
select S5PV210_SETUP_I2C2
|
|
select S5PV210_SETUP_IDE
|
|
help
|
|
Machine support for Samsung SMDKC110
|
|
S5PC110(MCP) is one of package option of S5PV210
|
|
|
|
endmenu
|
|
|
|
menu "S5PV210 Machines"
|
|
|
|
config MACH_SMDKV210
|
|
bool "SMDKV210"
|
|
select CPU_S5PV210
|
|
select S3C_DEV_FB
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C2
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select SAMSUNG_DEV_ADC
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select SAMSUNG_DEV_IDE
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select SAMSUNG_DEV_PWM
|
|
select SAMSUNG_DEV_TS
|
|
select S5PV210_SETUP_FB_24BPP
|
|
select S5PV210_SETUP_I2C1
|
|
select S5PV210_SETUP_I2C2
|
|
select S5PV210_SETUP_IDE
|
|
select S5PV210_SETUP_KEYPAD
|
|
select S5PV210_SETUP_SDHCI
|
|
help
|
|
Machine support for Samsung SMDKV210
|
|
|
|
config MACH_TORBRECK
|
|
bool "Torbreck"
|
|
select CPU_S5PV210
|
|
select ARCH_SPARSEMEM_ENABLE
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C2
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S5PV210_SETUP_I2C1
|
|
select S5PV210_SETUP_I2C2
|
|
select S5PV210_SETUP_SDHCI
|
|
help
|
|
Machine support for aESOP Torbreck
|
|
|
|
endmenu
|
|
|
|
endif
|