projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ccde0fb)
Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig"
authorSimon Horman <horms+renesas@verge.net.au>
Wed, 10 Dec 2014 02:33:06 +0000 (11:33 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 10 Dec 2014 02:33:24 +0000 (11:33 +0900)
This reverts commit 2315f9fce4da7df9362e4baeb5250d14ea48bf63.

Unfortunately enabling RCAR_AUDMAC_PP support this patch breaks dmaengine
support on R-Car Gen2 boards. This should be resolved by driver updates
in v3.20. But v3.19 was too early for this defconfig change.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/configs/shmobile_defconfig patch | blob | blame | history

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index cc67508a439a4486cb97365b04778b6fa0e2158e..302faab4b70fc4439703cbc3b7d368d9b0cf7ba4 100644 (file)
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -147,7 +147,6 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_S35390A=y
 CONFIG_DMADEVICES=y
 CONFIG_SH_DMAE=y
-CONFIG_RCAR_AUDMAC_PP=y
 CONFIG_RCAR_DMAC=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_PWM=y