Commit 27873b05 authored by Arnd Bergmann's avatar Arnd Bergmann

ARM: samsung: make SAMSUNG_DMADEV optional

The only remaining driver using the samsung dmadev code is the broken
samsung-ac97 sound driver. However, as found by Russell's autobuilder,
the elaborate dependency chains around it cause problems with
circular dependencies.

This is an attempt to simplify those dependencies by making the
SAMSUNG_DMADEV option user-selectable. I also try to keep the
default settings for all related options unchanged, so we don't
introduce any regressions against earlier testing on linux-next.

In particular, all s3c64xx and s5p* platforms keep selecting the
pl330 and pl08x drivers they require, but the select statement
is now moved towards the main platform option, and it remains
optional by unselecting CONFIG_DMADEVICES.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Kukjin Kim <kgene.kim@samsung.com>
parent 8c094524
...@@ -117,7 +117,7 @@ config S3C24XX_SETUP_TS ...@@ -117,7 +117,7 @@ config S3C24XX_SETUP_TS
Compile in platform device definition for Samsung TouchScreen. Compile in platform device definition for Samsung TouchScreen.
config S3C24XX_DMA config S3C24XX_DMA
bool "S3C2410 DMA support" bool "S3C2410 DMA support (deprecated)"
select S3C_DMA select S3C_DMA
help help
S3C2410 DMA support. This is needed for drivers like sound which S3C2410 DMA support. This is needed for drivers like sound which
......
...@@ -18,9 +18,9 @@ config CPU_S3C6410 ...@@ -18,9 +18,9 @@ config CPU_S3C6410
Enable S3C6410 CPU support Enable S3C6410 CPU support
config S3C64XX_PL080 config S3C64XX_PL080
bool "S3C64XX DMA using generic PL08x driver" def_bool DMADEVICES
select ARM_AMBA
select AMBA_PL08X select AMBA_PL08X
select SAMSUNG_DMADEV
config S3C64XX_SETUP_SDHCI config S3C64XX_SETUP_SDHCI
bool bool
......
...@@ -9,16 +9,18 @@ if ARCH_S5P64X0 ...@@ -9,16 +9,18 @@ if ARCH_S5P64X0
config CPU_S5P6440 config CPU_S5P6440
bool bool
select ARM_AMBA
select PL330_DMA if DMADEVICES
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV
select SAMSUNG_WAKEMASK if PM select SAMSUNG_WAKEMASK if PM
help help
Enable S5P6440 CPU support Enable S5P6440 CPU support
config CPU_S5P6450 config CPU_S5P6450
bool bool
select ARM_AMBA
select PL330_DMA if DMADEVICES
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV
select SAMSUNG_WAKEMASK if PM select SAMSUNG_WAKEMASK if PM
help help
Enable S5P6450 CPU support Enable S5P6450 CPU support
......
...@@ -9,8 +9,9 @@ if ARCH_S5PC100 ...@@ -9,8 +9,9 @@ if ARCH_S5PC100
config CPU_S5PC100 config CPU_S5PC100
bool bool
select ARM_AMBA
select PL330_DMA if DMADEVICES
select S5P_EXT_INT select S5P_EXT_INT
select SAMSUNG_DMADEV
help help
Enable S5PC100 CPU support Enable S5PC100 CPU support
......
...@@ -11,10 +11,11 @@ if ARCH_S5PV210 ...@@ -11,10 +11,11 @@ if ARCH_S5PV210
config CPU_S5PV210 config CPU_S5PV210
bool bool
select ARM_AMBA
select PL330_DMA if DMADEVICES
select S5P_EXT_INT select S5P_EXT_INT
select S5P_PM if PM select S5P_PM if PM
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV
help help
Enable S5PV210 CPU support Enable S5PV210 CPU support
......
...@@ -407,17 +407,16 @@ config SAMSUNG_PM_GPIO ...@@ -407,17 +407,16 @@ config SAMSUNG_PM_GPIO
Include legacy GPIO power management code for platforms not using Include legacy GPIO power management code for platforms not using
pinctrl-samsung driver. pinctrl-samsung driver.
endif
config SAMSUNG_DMADEV config SAMSUNG_DMADEV
bool bool "Use legacy Samsung DMA abstraction"
select ARM_AMBA depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S5P64X0 || ARCH_S3C64XX
select DMADEVICES select DMADEVICES
select PL330_DMA if (ARCH_EXYNOS5 || ARCH_EXYNOS4 || CPU_S5PV210 || CPU_S5PC100 || \ default y
CPU_S5P6450 || CPU_S5P6440)
help help
Use DMA device engine for PL330 DMAC. Use DMA device engine for PL330 DMAC.
endif
config S5P_DEV_MFC config S5P_DEV_MFC
bool bool
help help
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment