From 81bccbcba8dc0b3932ec74d63305490731f0b75b Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 5 Nov 2020 15:21:18 -0800 Subject: [PATCH] arm64: defconfig: Enable CONFIG_ARM_SMMU_POWER_ON_ALWAYS for GKI targets Enable CONFIG_ARM_SMMU_POWER_ON_ALWAYS for all GKI targets, and only in the GKI configuration. This feature should not be enabled in the QGKI/production configurations. Change-Id: Ifa16169b2595408d4f5c2142f6fddb9aa941eb2a Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/vendor/holi_GKI.config | 1 + arch/arm64/configs/vendor/lahaina_GKI.config | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/holi_GKI.config b/arch/arm64/configs/vendor/holi_GKI.config index 291a9ff05f1d..e381ffdb653b 100644 --- a/arch/arm64/configs/vendor/holi_GKI.config +++ b/arch/arm64/configs/vendor/holi_GKI.config @@ -85,6 +85,7 @@ CONFIG_USB_MSM_SSPHY_QMP=m CONFIG_MSM_HSUSB_PHY=m CONFIG_MSM_BT_POWER=m CONFIG_ARM_SMMU=m +CONFIG_ARM_SMMU_POWER_ALWAYS_ON=y CONFIG_MSM_CLK_AOP_QMP=m CONFIG_MSM_SPSS_UTILS=m CONFIG_IPA3=m diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config index 6add4d882170..1d39d4ed61a3 100644 --- a/arch/arm64/configs/vendor/lahaina_GKI.config +++ b/arch/arm64/configs/vendor/lahaina_GKI.config @@ -115,6 +115,7 @@ CONFIG_MSM_HSUSB_PHY=m CONFIG_MSM_CAMCC_LAHAINA=m CONFIG_MSM_BT_POWER=m CONFIG_ARM_SMMU=m +CONFIG_ARM_SMMU_POWER_ALWAYS_ON=y CONFIG_QTI_IOMMU_SUPPORT=m CONFIG_MSM_CLK_AOP_QMP=m CONFIG_MSM_SPSS_UTILS=m