summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-03-04 20:52:36 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-03-04 20:52:36 +0300
commita032fd0356faa766c75d25f8bf2d70c0fedc2de0 (patch)
tree758bc9aefd2c2a17cbf4b43eea6ffea5dd6bc9f5
parentf8a084b2edf928648186ab6d33a58fefab5266b3 (diff)
linaro/configs: arndale: disable CONFIG_EXYNOS_IOMMU
Enabling Exynos DRM IOMMU support for Exynos is currently broken and causes a BUG on exynos-iommu driver. See https://lkml.org/lkml/2015/2/17/163 for the details. Also remove DRM_EXYNOS_IOMMU as it is not user selectable any more: commit 8dcc14f82f06 ("drm/exynos: IOMMU support should not be selectable by user"). Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r--linaro/configs/arndale.conf2
-rw-r--r--linaro/configs/arndale_octa.conf3
2 files changed, 0 insertions, 5 deletions
diff --git a/linaro/configs/arndale.conf b/linaro/configs/arndale.conf
index b832473d90e..6d6f6de3024 100644
--- a/linaro/configs/arndale.conf
+++ b/linaro/configs/arndale.conf
@@ -51,7 +51,6 @@ CONFIG_REGULATOR_S5M8767=y
CONFIG_DRM=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_EXYNOS=y
-# CONFIG_DRM_EXYNOS_IOMMU is not set
CONFIG_DRM_EXYNOS_DMABUF=y
CONFIG_DRM_EXYNOS_HDMI=y
CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -82,7 +81,6 @@ CONFIG_MMC_DW_IDMAC=y
CONFIG_MMC_DW_EXYNOS=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_S3C=y
-CONFIG_EXYNOS_IOMMU=y
CONFIG_PHY_EXYNOS5250_SATA=y
CONFIG_PHY_SAMSUNG_USB2=y
CONFIG_PHY_EXYNOS4210_USB2=y
diff --git a/linaro/configs/arndale_octa.conf b/linaro/configs/arndale_octa.conf
index 2bb86b8aede..b8c42a665ff 100644
--- a/linaro/configs/arndale_octa.conf
+++ b/linaro/configs/arndale_octa.conf
@@ -42,7 +42,6 @@ CONFIG_REGULATOR_S2MPS11=y
CONFIG_DRM=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_EXYNOS=y
-CONFIG_DRM_EXYNOS_IOMMU=y
CONFIG_DRM_EXYNOS_DMABUF=y
CONFIG_DRM_EXYNOS_HDMI=y
CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -72,8 +71,6 @@ CONFIG_MMC_DW_IDMAC=y
CONFIG_MMC_DW_EXYNOS=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_S3C=y
-CONFIG_EXYNOS_IOMMU=y
-CONFIG_EXYNOS_IOMMU_DEBUG=y
CONFIG_EXTCON=y
CONFIG_PHY_SAMSUNG_USB2=y
CONFIG_PHY_EXYNOS4210_USB2=y