From 6ee243cd06321e19df303a3b1ed38dd82f188700 Mon Sep 17 00:00:00 2001 From: Damian Hobson-Garcia Date: Tue, 16 Dec 2014 10:12:45 +0900 Subject: [PATCH] Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig This patch is adapdted from commit id 4ba67a304ed3ef52520b382dfef7ed6b1bd08014 from the Renesas snapshot in https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git. Original commit message follows: Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on def 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 (cherry picked from commit b6f6383b98092a1759d19893875bba90c8d9f446) Signed-off-by: Simon Horman Change-Id: Ie8ab7c7bf12458777418e915f50af625e1e6920d Signed-off-by: Damian Hobson-Garcia --- arch/arm/configs/tizen_rcar-m2_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/tizen_rcar-m2_defconfig b/arch/arm/configs/tizen_rcar-m2_defconfig index 5a5680f..416c10e 100644 --- a/arch/arm/configs/tizen_rcar-m2_defconfig +++ b/arch/arm/configs/tizen_rcar-m2_defconfig @@ -179,7 +179,6 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_S35390A=y CONFIG_DMADEVICES=y CONFIG_SH_DMAE=y -CONFIG_RCAR_AUDMAC_PP=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y -- 2.7.4