From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Mon, 13 Sep 2021 00:08:32 +0000 (-0400)
Subject: arm64: configs: g12a: Move CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=HEAD;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

arm64: configs: g12a: Move CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR

Change-Id: Iecf9ef8b09a4edef3e7236353e739db3b9353b92
---

diff --git a/arch/arm64/configs/g12a_defconfig b/arch/arm64/configs/g12a_defconfig
index 85099b26edf1..caf2ed6af4b8 100644
--- a/arch/arm64/configs/g12a_defconfig
+++ b/arch/arm64/configs/g12a_defconfig
@@ -490,7 +490,6 @@ CONFIG_SPI_MESON_SPICC=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_REGULATOR=y
diff --git a/arch/arm64/configs/g12a_variant_defconfig b/arch/arm64/configs/g12a_variant_defconfig
new file mode 100644
index 000000000000..502c5f4fe43d
--- /dev/null
+++ b/arch/arm64/configs/g12a_variant_defconfig
@@ -0,0 +1 @@
+CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
diff --git a/arch/arm64/configs/sabrina_defconfig b/arch/arm64/configs/sabrina_defconfig
index 93cef29d8db8..a1a65fe67fa5 100644
--- a/arch/arm64/configs/sabrina_defconfig
+++ b/arch/arm64/configs/sabrina_defconfig
@@ -5,6 +5,6 @@ CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=y
 CONFIG_TYPEC_RT1711H=y
 CONFIG_TYPEC_FUSB302=y
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
-