From 9e09648c96a9e863eee38033ab7bb0211daf3c76 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 14 Sep 2023 11:23:19 +0100
Subject: [PATCH] wlan-devicetree: Update from OOS 13.1.0.590(EX01)

---
 qcom/wlan/kalama-cnss.dtsi | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/qcom/wlan/kalama-cnss.dtsi b/qcom/wlan/kalama-cnss.dtsi
index 3d89b810..e1a9fed3 100644
--- a/qcom/wlan/kalama-cnss.dtsi
+++ b/qcom/wlan/kalama-cnss.dtsi
@@ -29,20 +29,6 @@
 				bias-pull-down;
 			};
 		};
-
-		wifi_ant_switch: wifi_ant_switch {
-			mux {
-				pins = "gpio160";
-				function = "gpio";
-			};
-
-			config {
-				pins = "gpio160";
-				bias-pull-up;
-				output-high;
-			};
-		};
-
 	};
 };
 
@@ -69,11 +55,9 @@
 			wlan-en-gpio = <&tlmm 80 0>;
 			qcom,bt-en-gpio = <&tlmm 81 0>;
 			qcom,sw-ctrl-gpio = <&tlmm 82 0>;
-			pinctrl-names = "wlan_en_active", "wlan_en_sleep", "wifi_ant_gpio";
+			pinctrl-names = "wlan_en_active", "wlan_en_sleep";
 			pinctrl-0 = <&cnss_wlan_en_active>;
 			pinctrl-1 = <&cnss_wlan_en_sleep>;
-			pinctrl-2 = <&wifi_ant_switch>;
-			wlan-asus_ant_160 = <&tlmm 160 0>;
 			qcom,wlan;
 			qcom,wlan-rc-num = <1>;
 			qcom,wlan-ramdump-dynamic = <0x420000>;
@@ -160,11 +144,9 @@
 			wlan-en-gpio = <&tlmm 80 0>;
 			qcom,bt-en-gpio = <&tlmm 81 0>;
 			qcom,sw-ctrl-gpio = <&tlmm 82 0>;
-			pinctrl-names = "wlan_en_active", "wlan_en_sleep", "wifi_ant_gpio";
+			pinctrl-names = "wlan_en_active", "wlan_en_sleep";
 			pinctrl-0 = <&cnss_wlan_en_active>;
 			pinctrl-1 = <&cnss_wlan_en_sleep>;
-			pinctrl-2 = <&wifi_ant_switch>;
-			wlan-asus_ant_160 = <&tlmm 160 0>;
 			qcom,wlan;
 			qcom,wlan-rc-num = <0>;
 			qcom,wlan-ramdump-dynamic = <0x780000>;
@@ -172,6 +154,9 @@
 			cnss-enable-self-recovery;
 			use-pm-domain;
 			mboxes = <&qmp_aop 0>;
+			//#ifdef OPLUS_FEATURE_WIFI_MAC
+			use-nv-mac;
+			//#endif /* OPLUS_FEATURE_WIFI_MAC */
 
 			vdd-wlan-io-supply = <&L15B>;
 			qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>;