Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeb46920 authored Nov 11, 2020 by qctecmdr Committed by Gerrit - the friendly Code Review server Nov 11, 2020

Merge "arm64: defconfig: Enable CONFIG_ARM_SMMU_POWER_ON_ALWAYS for GKI targets"

parents c64a5ca3 81bccbcb

arch/arm/configs/vendor/sdxlemur.config

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ CONFIG_IOMMU_IO_PGTABLE_FAST=y
		CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS=y
		CONFIG_IOMMU_LIMIT_IOVA_ALIGNMENT=y
		CONFIG_ARM_SMMU_SKIP_MAP_POWER_ON=y
		CONFIG_ARM_SMMU_POWER_OFF_AFTER_UNMAP=y
		CONFIG_QTI_IOMMU_SUPPORT=y
		CONFIG_QCOM_SCM=y
		CONFIG_QCOM_SECURE_BUFFER=y

arch/arm64/configs/vendor/holi_GKI.config

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

arch/arm64/configs/vendor/holi_QGKI.config

+0 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ CONFIG_QCOM_LAZY_MAPPING=y
		CONFIG_DEBUG_FS=y
		CONFIG_IOMMU_DYNAMIC_DOMAINS=y
		CONFIG_ARM_SMMU_SKIP_MAP_POWER_ON=y
		CONFIG_ARM_SMMU_POWER_OFF_AFTER_UNMAP=y
		CONFIG_QCOM_SECURE_BUFFER=y
		# CONFIG_ZONE_DMA32 is not set
		CONFIG_EDAC_KRYO_ARM64=y

arch/arm64/configs/vendor/lahaina_GKI.config

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

arch/arm64/configs/vendor/lahaina_QGKI.config

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ CONFIG_ION_MSM_HEAPS=y
		CONFIG_IOMMU_IO_PGTABLE_FAST=y
		CONFIG_IOMMU_DYNAMIC_DOMAINS=y
		CONFIG_ARM_SMMU_SKIP_MAP_POWER_ON=y
		CONFIG_ARM_SMMU_POWER_OFF_AFTER_UNMAP=y
		# CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST is not set
		# CONFIG_IOMMU_IO_PGTABLE_FAST_PROVE_TLB is not set
		# CONFIG_SOFTLOCKUP_DETECTOR is not set