From cafbdff9c6ecb234efb5e79a5fa28c04f759a0b6 Mon Sep 17 00:00:00 2001
From: Anan Jaser <ananjaser@gmail.com>
Date: Wed, 1 Nov 2023 00:32:29 +0400
Subject: [PATCH] configs: exynos8890: Adjust WiFi and memory

* Enable RBIN on gracelte only (not used on S7/S7E)
* Enable anti-swelling on S7E alongside S7 (matches latest stock config)
* Correct WiFi configuration (Changes CLMN Options, Keep grace as base)
---
 arch/arm64/configs/exynos8890_defconfig | 3 ---
 arch/arm64/configs/gracer_defconfig     | 3 +++
 arch/arm64/configs/hero2_defconfig      | 4 ++++
 arch/arm64/configs/hero_defconfig       | 3 +++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/configs/exynos8890_defconfig b/arch/arm64/configs/exynos8890_defconfig
index fc86c9e7f9d6..9084ee338073 100644
--- a/arch/arm64/configs/exynos8890_defconfig
+++ b/arch/arm64/configs/exynos8890_defconfig
@@ -417,7 +417,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
 CONFIG_CMA_PINPAGE_MIGRATION=y
-CONFIG_CMA_AREAS=8
 # CONFIG_ZSWAP is not set
 # CONFIG_ZSWAP_ENABLE_WRITEBACK is not set
 # CONFIG_ZSWAP_COMPACTION is not set
@@ -435,7 +434,6 @@ CONFIG_TIGHT_PGDAT_BALANCE=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_MMAP_READAROUND_LIMIT=32
 CONFIG_LARGE_DIRTY_BUFFER=y
-CONFIG_RBIN=y
 CONFIG_SECCOMP=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -3917,7 +3915,6 @@ CONFIG_ION=y
 # CONFIG_ION_DUMMY is not set
 CONFIG_ION_EXYNOS=y
 CONFIG_ION_EXYNOS_STAT_LOG=y
-CONFIG_ION_RBIN_HEAP=y
 CONFIG_ION_EXYNOS_OF=y
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_WIMAX_GDM72XX is not set
diff --git a/arch/arm64/configs/gracer_defconfig b/arch/arm64/configs/gracer_defconfig
index 0d1c89687d9d..e4765bf00062 100644
--- a/arch/arm64/configs/gracer_defconfig
+++ b/arch/arm64/configs/gracer_defconfig
@@ -3,6 +3,9 @@
 #
 CONFIG_DEV_RIL_BRIDGE=y
 CONFIG_MODEM_PIE_REV=y
+CONFIG_CMA_AREAS=8
+CONFIG_RBIN=y
+CONFIG_ION_RBIN_HEAP=y
 CONFIG_MUIC_SUPPORT_CCIC=y
 # CONFIG_WLAN_HERO is not set
 CONFIG_WLAN_HERO2=y
diff --git a/arch/arm64/configs/hero2_defconfig b/arch/arm64/configs/hero2_defconfig
index 72b80b14f214..45bd65f05d04 100644
--- a/arch/arm64/configs/hero2_defconfig
+++ b/arch/arm64/configs/hero2_defconfig
@@ -1,14 +1,18 @@
 #
 # hero2lte_defconfig
 #
+CONFIG_CMA_AREAS=7
 CONFIG_FB_DSU_REG_LOCK=y
 CONFIG_EXYNOS_DECON_LCD_MCD=y
 # CONFIG_LCD_ESD_IDLE_MODE is not set
 CONFIG_PANEL_S6E3HF4_WQHD=y
 # CONFIG_PANEL_S6E3HA3_DYNAMIC is not set
 # CONFIG_PANEL_DUALIZATION is not set
+CONFIG_PREVENT_SWELLING_BATTERY=y
 CONFIG_SENSORS_SX9310_NORMAL_TOUCH_THRESHOLD=168
 CONFIG_SENSORS_HERO2=y
 CONFIG_TOUCHSCREEN_FTS7=y
 CONFIG_WAKE_GESTURES=y
 CONFIG_MODEL_HERO2LTE=y
+# CONFIG_WLAN_HERO is not set
+CONFIG_WLAN_HERO2=y
diff --git a/arch/arm64/configs/hero_defconfig b/arch/arm64/configs/hero_defconfig
index 908615036724..e91c522785a1 100644
--- a/arch/arm64/configs/hero_defconfig
+++ b/arch/arm64/configs/hero_defconfig
@@ -1,6 +1,7 @@
 #
 # herolte_defconfig
 #
+CONFIG_CMA_AREAS=7
 # CONFIG_FB_DSU_REG_LOCK is not set
 # CONFIG_EXYNOS_DECON_LCD_MCD is not set
 CONFIG_LCD_ESD_IDLE_MODE=y
@@ -12,3 +13,5 @@ CONFIG_SENSORS_SX9310_NORMAL_TOUCH_THRESHOLD=176
 CONFIG_TOUCHSCREEN_FTS7=y
 CONFIG_WAKE_GESTURES=y
 CONFIG_MODEL_HEROLTE=y
+CONFIG_WLAN_HERO=y
+# CONFIG_WLAN_HERO2 is not set
\ No newline at end of file