Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3

SBMerger: 478053055
Change-Id: Ibe92716f86bc955cd70d854802932b03057823e8
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
diff --git a/dts/gs201-lynx-battery-data.dtsi b/dts/gs201-lynx-battery-data.dtsi
index 627e87f..8f346a2 100644
--- a/dts/gs201-lynx-battery-data.dtsi
+++ b/dts/gs201-lynx-battery-data.dtsi
@@ -144,10 +144,10 @@
 			/* 0x002e */	0x0400	/* CGain */
 		>;
 	};
-	/* 3_L10_LSN_061322_RC2_INI_1028_change\ QRtable.txt http://b/255458373#comment11 */
+	/* 3_L10_LSN_061322_RC2_INI_01092023.txt http://b/264837280#comment1 */
 	maxim,lsn-pack-b-3k {
 		maxim,batt-id-kohm = <3>;
-		maxim,model-version = <5>;
+		maxim,model-version = <6>;
 		maxim,force-reset-model-data;
 		maxim,rc1-tempco = /bits/ 16 <0x173a>;
 		maxim,rc2-tempco = /bits/ 16 <0x1602>;
@@ -173,8 +173,8 @@
 			/* 0x0045 */	0x022a	/* dQacc */
 			/* 0x0023 */	0x08a9	/* nFullCapNom */
 			/* 0x003A */	0xA561	/* V_empty */
-			/* 0x0012 */	0x2500	/* nQRTable00 -> QResidual00 */
-			/* 0x0022 */	0x1180	/* nQRTable10 -> QResidual10 */
+			/* 0x0012 */	0x2200	/* nQRTable00 -> QResidual00 */
+			/* 0x0022 */	0x1000	/* nQRTable10 -> QResidual10 */
 			/* 0x0032 */	0x0780	/* nQRTable20 -> QResidual20 */
 			/* 0x0042 */	0x0580	/* nQRTable30 -> QResidual30 */
 			/* 0x0038 */	0x0760	/* nRcomp0 */
diff --git a/dts/gs201-lynx-battery.dtsi b/dts/gs201-lynx-battery.dtsi
index b0c7712..42813a0 100644
--- a/dts/gs201-lynx-battery.dtsi
+++ b/dts/gs201-lynx-battery.dtsi
@@ -14,6 +14,22 @@
 	google,ttf-soc-table =  <55 63 77 87 89  92  96 100>;
 	google,ttf-elap-table = <40 46 54 73 84 104 150 213>;
 	google,ttf-tier-table = <0 65 80>;
+
+	google,temp-filter-enable;
+
+	google,aacr-disable;
+
+	google,batt-id-2-cos {
+		google,batt-id = <2>;
+		google,aacr-ref-cycles = <100 200 300 400 500 600 700 800>;
+		google,aacr-ref-fade10 = <  2  14  25  34  43  51  59  67>;
+	};
+
+	google,batt-id-3-lsn {
+		google,batt-id = <3>;
+		google,aacr-ref-cycles = <300 400 500 600 700 800>;
+		google,aacr-ref-fade10 = <  6  16  25  34  46  53>;
+	};
 };
 
 &max77759_fg {
@@ -26,7 +42,7 @@
 	maxim,filtercfg-temp = <100>;
 	maxim,filtercfg-temp-hysteresis = <30>;
 	maxim,filtercfg-default = /bits/ 16 <0xc613>;
-	maxim,filtercfg-adjust = /bits/ 16 <0xc615>;
+	maxim,filtercfg-adjust = /bits/ 16 <0xc617>;
 	maxim,fg-data {
 		#include "gs201-lynx-battery-data.dtsi"
 	};
diff --git a/dts/gs201-lynx-charging.dtsi b/dts/gs201-lynx-charging.dtsi
index 8c703da..4a83542 100644
--- a/dts/gs201-lynx-charging.dtsi
+++ b/dts/gs201-lynx-charging.dtsi
@@ -26,13 +26,14 @@
 				google,thermal-mitigation =
 					<4000000 3200000 3000000 2800000 2600000 2400000 2300000 2200000 2000000 1500000 1000000 500000>;
 				google,wlc-thermal-mitigation =
-					<1100000 750000 750000 500000 500000 500000 250000 250000 250000 100000 100000 100000>;
+					<1100000 750000 750000 500000 500000 500000 250000 250000 250000 250000 250000 250000>;
 
 				// thermal budgets
 				google,thermal-mitigation-budgets =
 					<4599000 4340000 4040000 3676000 2795000 2340000 2053000 1686000 1441000  957000  597000  352000>;
 				google,wlc-thermal-mitigation-budgets =
 					<4599000 4040000 3676000 3153000 2795000 2340000 2053000 1686000 1441000  957000  597000  352000>;
+				google,therm-wlc-overrides-fcc;
 				google,thermal-stats-lvl-map = <0 2 5 8 11>;
 
 				google,wlc-thermal-dc-fan-alarm = <2>;
diff --git a/update_symbol_list_lynx-staging.sh b/update_symbol_list_lynx-staging.sh
index 731a1ed..0802b52 100755
--- a/update_symbol_list_lynx-staging.sh
+++ b/update_symbol_list_lynx-staging.sh
@@ -4,7 +4,7 @@
 BUILD_STAGING_KERNEL=1 \
 GKI_KERNEL_DIR=aosp-staging \
 GKI_KERNEL_REMOTE=partner-common \
-GKI_KERNEL_BRANCH=android13-5.10-pixel-staging-tm-qpr2 \
+GKI_KERNEL_BRANCH=android13-5.10-pixel-staging-tm-qpr3 \
 BUILD_SCRIPT="./build_lynx.sh" \
 DEVICE_KERNEL_BUILD_CONFIG=private/devices/google/lynx/build.config.lynx \
 private/gs-google/update_symbol_list.sh "$@"