From 6c3f29edd75f504ec92acb85bc082b19b3de7dcf Mon Sep 17 00:00:00 2001
From: Maxim Schwalm <maxim.schwalm@gmail.com>
Date: Wed, 14 Jul 2021 05:51:24 +0300
Subject: [PATCH] ARM: tegra: Enable CONFIG_CROS_EC
Git-commit: 6c3f29edd75f504ec92acb85bc082b19b3de7dcf
Patch-mainline: v5.15-rc1
References: git-fixes
Updating the tegra_defconfig was omitted, when the ChromeOS EC config
options were renamed by a previous commit. Fix it.
Fixes: 67c70aa86f8b ("arm/arm64: defconfig: Update configs to use the new CROS_EC options")
Signed-off-by: Maxim Schwalm <maxim.schwalm@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
arch/arm/configs/tegra_defconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 52db1c4f9de4..0bb0846265b5 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -175,7 +175,6 @@ CONFIG_WATCHDOG=y
CONFIG_MAX77620_WATCHDOG=y
CONFIG_TEGRA_WATCHDOG=y
CONFIG_MFD_AS3722=y
-CONFIG_MFD_CROS_EC_DEV=y
CONFIG_MFD_MAX77620=y
CONFIG_MFD_MAX8907=y
CONFIG_MFD_STMPE=y
@@ -289,6 +288,8 @@ CONFIG_NVEC_POWER=y
CONFIG_NVEC_PAZ00=y
CONFIG_STAGING_MEDIA=y
CONFIG_TEGRA_VDE=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC=y
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_ARCH_TEGRA_2x_SOC=y
--
2.31.1