Merge 25d6be32fd on remote branch

Change-Id: I9aeddc624f519e7aedee7dcb1e6631c35910a5df

bindings/pci/pci-msm.txt

@@ -629,6 +629,17 @@ i2c child node
 	Value Type: Array of <u32>
 	Definition: List of slave registers to dump by i2c read
 
+- version-reg:
+	Usage: optional
+	Value type: <u32>
+	Definition: Register to find ntn3 switch version
+
+- force-i2c-setting:
+	Usage: optional
+	Value type: <bool>
+	Definition: If force-i2c-setting flag is set
+		    then de_emphasis settings are updated
+		    irrespective of the chip version via i2c_writes
 =======
 Example
 =======
@@ -641,5 +652,7 @@ Example
 		ep-reset-reg = <0x801210>;
 		ep-reset-gpio-mask = <0xf>;
 		dump-regs = <0x801330 0x801350 0x801370>;
+		version-reg = <0x800000>;
+		force-i2c-setting;
 	};
 };

qcom/sdxlemur-mtp-cpe-pine1x.dtsi

@@ -53,6 +53,8 @@
 };
 
 &wifi0 {
+	/* QCN9000 6G */
+	board_id = <0xa4>;
 	status = "ok"
 };
 

qcom/sdxlemur-mtp-cpe-pine2x.dtsi

@@ -64,11 +64,13 @@
 };
 
 &wifi0 {
+	/* QCN9000 5G with SBS filter */
 	status = "ok"
-	board_id = <0xa0>;
+	board_id = <0xa3>;
 };
 
 &wifi1 {
+	/* QCN9000 2G */
 	status = "ok"
 	board_id = <0xa1>;
 };

qcom/sdxlemur-mtp-cpe.dtsi

@@ -91,6 +91,7 @@
 		gpio-config-reg = <0x801208>;
 		ep-reset-reg = <0x801210>;
 		ep-reset-gpio-mask = <0xc>;
+		version-reg = <0x800000>;
 		dump-regs = <0x801330 0x801350 0x801370>;
 		reg_update = <0x82c030 0x1
 					0x828000 0x3
@@ -104,9 +105,9 @@
 					0x82c01c 0x10
 					0x82c030 0xf
 					0x828000 0xf
-					0x82b268 0x2
-					0x82C02C 0x4
-					0x8249DC 0x0>;
+					0x82b268 0x2>;
+		switch_reg_update = <0x82C02C 0x4
+					0x824A0C 0x4>;
 	};
 };
 

qcom/sdxlemur-qcn9000.dtsi

@@ -39,7 +39,6 @@
 		qrtr_node_id = <0x20>;
 		qca,auto-restart;
 		tgt-mem-mode = <0x1>;
-		board_id = <0xa4>;
 
 		mhi,max-channels = <30>;
 		mhi,timeout = <10000>;
@@ -163,7 +162,6 @@
 		qrtr_node_id = <0x21>;
 		qca,auto-restart;
 		tgt-mem-mode = <0x1>;
-		board_id = <0xa4>;
 
 		mhi,max-channels = <30>;
 		mhi,timeout = <10000>;