blob: 36661ec146cf550fdcfd7a77be4bb9266c812ef8 [file] [log] [blame]
From 8eb062fddf2e97851c7336101d74ca5e878210b5 Mon Sep 17 00:00:00 2001
From: Thierry Reding <treding@nvidia.com>
Date: Wed, 14 Mar 2018 12:10:14 +0100
Subject: [PATCH 1031/1795] arm64: defconfig: Enable the Tegra SMMU by default
Display and graphics can't work together without an SMMU, so it is
effectively always getting enabled anyway.
Signed-off-by: Thierry Reding <treding@nvidia.com>
(cherry picked from commit dc7073b0234ee6f48a8e609cd2def777de1e2d26)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm64/configs/defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 81ddc9491ec8..151db66f5347 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -547,6 +547,7 @@ CONFIG_BCM2835_MBOX=y
CONFIG_HI6220_MBOX=y
CONFIG_QCOM_APCS_IPC=y
CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_ARM_SMMU=y
CONFIG_ARM_SMMU_V3=y
CONFIG_QCOM_IOMMU=y
@@ -562,6 +563,8 @@ CONFIG_ARCH_TEGRA_210_SOC=y
CONFIG_ARCH_TEGRA_186_SOC=y
CONFIG_ARCH_TEGRA_194_SOC=y
CONFIG_EXTCON_USB_GPIO=y
+CONFIG_MEMORY=y
+CONFIG_TEGRA_MC=y
CONFIG_IIO=y
CONFIG_EXYNOS_ADC=y
CONFIG_ROCKCHIP_SARADC=m
--
2.19.0