Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10

SBMerger: 605678113
Change-Id: I5dad03fa65573bf45a1a4f5eba12e29547b48dd5
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 22408b9..0f9e3f4 100644
--- a/dts/gs201-lynx-battery-data.dtsi
+++ b/dts/gs201-lynx-battery-data.dtsi
@@ -97,10 +97,10 @@
 			/* 0x002e */	0x0400	/* CGain */
 		>;
 	};
-	/* 2_L10_COS_031622_RC2_INI_Rev7.txt http://b/308977311#comment7 */
+	/* 2_L10_COS_031622_RC2_INI_Rev7.txt http://b/323608826#comment10 */
 	maxim,cos-pack-b-2k {
 		maxim,batt-id-kohm = <2>;
-		maxim,model-version = <6>;
+		maxim,model-version = <7>;
 		maxim,force-reset-model-data;
 		maxim,rc1-tempco = /bits/ 16 <0x1d0f>;
 		maxim,rc2-tempco = /bits/ 16 <0x0902>;
@@ -115,7 +115,7 @@
 		>;
 		maxim,fg-params = /bits/ 16 <
 			/* 0x0036 */	0xf060	/* nIAvgEmpty -> IAvgEmpty */
-			/* 0x002a */	0x0839	/* nRelaxCFG -> RelaxCFG */
+			/* 0x002a */	0x1439	/* nRelaxCFG -> RelaxCFG */
 			/* 0x0028 */	0x260e	/* nLearnCFG -> LearnCFG */
 			/* 0x001D */	0x4217	/* Config: */
 			/* 0x00BB */	0x0090	/* Config2: OCVQen|DSOCIi */
@@ -144,10 +144,10 @@
 			/* 0x002e */	0x0400	/* CGain */
 		>;
 	};
-	/* 3_L10_LSN_061322_RC2_INI_Rev8.txt http://b/308977311#comment7 */
+	/* 3_L10_LSN_061322_RC2_INI_Rev8.txt http://b/323608826#comment10 */
 	maxim,lsn-pack-b-3k {
 		maxim,batt-id-kohm = <3>;
-		maxim,model-version = <7>;
+		maxim,model-version = <8>;
 		maxim,force-reset-model-data;
 		maxim,rc1-tempco = /bits/ 16 <0x173a>;
 		maxim,rc2-tempco = /bits/ 16 <0x1602>;
@@ -162,7 +162,7 @@
 		>;
 		maxim,fg-params = /bits/ 16 <
 			/* 0x0036 */	0xf060	/* nIAvgEmpty -> IAvgEmpty */
-			/* 0x002a */	0x0839	/* nRelaxCFG -> RelaxCFG */
+			/* 0x002a */	0x1439	/* nRelaxCFG -> RelaxCFG */
 			/* 0x0028 */	0x260e	/* nLearnCFG -> LearnCFG */
 			/* 0x001D */	0x4217	/* Config: */
 			/* 0x00BB */	0x0090	/* Config2: OCVQen|DSOCIi */
diff --git a/dts/gs201-lynx-wcharger.dtsi b/dts/gs201-lynx-wcharger.dtsi
index 62cc0b0..f93499b 100644
--- a/dts/gs201-lynx-wcharger.dtsi
+++ b/dts/gs201-lynx-wcharger.dtsi
@@ -42,7 +42,6 @@
 
 &hsi2c_15 {
 	p9222@61 {
-		dev-name = "p9222";
 		compatible = "idt,p9222";
 		reg = <0x61>;
 		status = "ok";