Merge "ARM: dts: msm: Add Support for new PM660L/A versions for SDM660/SDM630"

67 files changed, 182 insertions, 81 deletions

diff --git a/arch/arm/boot/dts/qcom/sda630-cdp.dts b/arch/arm/boot/dts/qcom/sda630-cdp.dts
index 665fa94d9713..beefb2de1ce9 100644
--- a/arch/arm/boot/dts/qcom/sda630-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda630-cdp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
 	qcom,board-id = <1 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda630-mtp.dts b/arch/arm/boot/dts/qcom/sda630-mtp.dts
index 08a996ddb709..41afa720c389 100644
--- a/arch/arm/boot/dts/qcom/sda630-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda630-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sda630-mtp", "qcom,sda630", "qcom,mtp";
 	qcom,board-id = <8 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
index 6094d22c1c92..01455d054e03 100644
--- a/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A CDP";
 	compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
 	qcom,board-id = <1 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
index 49c10129aada..3dd15d889afd 100644
--- a/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A MTP";
 	compatible = "qcom,sda630-mtp", "qcom,sda630", "qcom,mtp";
 	qcom,board-id = <8 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts
index 4c4c758daa29..155099b5be9d 100644
--- a/arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A QRD HDK630";
 	compatible = "qcom,sda630-qrd", "qcom,sda630", "qcom,qrd";
 	qcom,board-id = <0x0016000b 0x00>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &pm660a_oledb {
diff --git a/arch/arm/boot/dts/qcom/sda636-cdp.dts b/arch/arm/boot/dts/qcom/sda636-cdp.dts
index a4cc4b3f4662..2962a6bc3691 100644
--- a/arch/arm/boot/dts/qcom/sda636-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda636-cdp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sda636-cdp", "qcom,sda636", "qcom,cdp";
 	qcom,board-id = <1 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda636-mtp.dts b/arch/arm/boot/dts/qcom/sda636-mtp.dts
index 3fd19437b3eb..237d27791b94 100644
--- a/arch/arm/boot/dts/qcom/sda636-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda636-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sda636-mtp", "qcom,sda636", "qcom,mtp";
 	qcom,board-id = <8 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda636-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sda636-pm660a-cdp.dts
index 72db1be68c83..5f0e5275e828 100644
--- a/arch/arm/boot/dts/qcom/sda636-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda636-pm660a-cdp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660A CDP";
 	compatible = "qcom,sda636-cdp", "qcom,sda636", "qcom,cdp";
 	qcom,board-id = <1 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda636-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sda636-pm660a-mtp.dts
index fd5b94420102..c15bc159dffd 100644
--- a/arch/arm/boot/dts/qcom/sda636-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda636-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660A MTP";
 	compatible = "qcom,sda636-mtp", "qcom,sda636", "qcom,mtp";
 	qcom,board-id = <8 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda636-pm660a-qrd-hdk.dts b/arch/arm/boot/dts/qcom/sda636-pm660a-qrd-hdk.dts
index 3535c54f5dd0..f4a9592bf4ff 100644
--- a/arch/arm/boot/dts/qcom/sda636-pm660a-qrd-hdk.dts
+++ b/arch/arm/boot/dts/qcom/sda636-pm660a-qrd-hdk.dts
@@ -158,7 +158,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660A QRD HDK636";
 	compatible = "qcom,sda636-qrd", "qcom,sda636", "qcom,qrd";
 	qcom,board-id = <0x0016000b 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &pm660a_oledb {
diff --git a/arch/arm/boot/dts/qcom/sda658-cdp.dts b/arch/arm/boot/dts/qcom/sda658-cdp.dts
index 9992963b8705..5db30e379a2d 100644
--- a/arch/arm/boot/dts/qcom/sda658-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda658-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,6 @@
 	compatible = "qcom,sda658-cdp", "qcom,sda658", "qcom,cdp";
 	qcom,board-id = <1 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sda658-mtp.dts b/arch/arm/boot/dts/qcom/sda658-mtp.dts
index f4322ecfd701..138c6fdc74df 100644
--- a/arch/arm/boot/dts/qcom/sda658-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda658-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,6 @@
 	compatible = "qcom,sda658-mtp", "qcom,sda658", "qcom,mtp";
 	qcom,board-id = <8 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sda658-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sda658-pm660a-cdp.dts
index c280c4afda51..b4e7996e0bb6 100644
--- a/arch/arm/boot/dts/qcom/sda658-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda658-pm660a-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,7 @@
 	model = "Qualcomm Technologies, Inc. SDA 658 PM660 + PM660A CDP";
 	compatible = "qcom,sda658-cdp", "qcom,sda658", "qcom,cdp";
 	qcom,board-id = <1 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sda658-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sda658-pm660a-mtp.dts
index ba8741e2a068..52820a557ecf 100644
--- a/arch/arm/boot/dts/qcom/sda658-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda658-pm660a-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,7 @@
 	model = "Qualcomm Technologies, Inc. SDA 658 PM660 + PM660A MTP";
 	compatible = "qcom,sda658-mtp", "qcom,sda658", "qcom,mtp";
 	qcom,board-id = <8 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sda660-cdp.dts b/arch/arm/boot/dts/qcom/sda660-cdp.dts
index 92097729087b..4299a0957455 100644
--- a/arch/arm/boot/dts/qcom/sda660-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda660-cdp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sda660-cdp", "qcom,sda660", "qcom,cdp";
 	qcom,board-id = <1 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda660-mtp.dts b/arch/arm/boot/dts/qcom/sda660-mtp.dts
index 027137e54c0e..71263375b1c0 100644
--- a/arch/arm/boot/dts/qcom/sda660-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda660-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sda660-mtp", "qcom,sda660", "qcom,mtp";
 	qcom,board-id = <8 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts
index a46083a00298..38900dab7596 100644
--- a/arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A CDP";
 	compatible = "qcom,sda660-cdp", "qcom,sda660", "qcom,cdp";
 	qcom,board-id = <1 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts
index d94cf8ea1eb5..98ab098d6cdc 100644
--- a/arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A MTP";
 	compatible = "qcom,sda660-mtp", "qcom,sda660", "qcom,mtp";
 	qcom,board-id = <8 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts b/arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts
index 0f4b462fd57b..5f44b4c32c98 100644
--- a/arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts
+++ b/arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts
@@ -158,7 +158,9 @@
 	model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A QRD HDK660";
 	compatible = "qcom,sda660-qrd", "qcom,sda660", "qcom,qrd";
 	qcom,board-id = <0x0016000b 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &pm660a_oledb {
diff --git a/arch/arm/boot/dts/qcom/sdm630-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-cdp.dts
index 973df0df3be5..8da3dd6726e6 100644
--- a/arch/arm/boot/dts/qcom/sdm630-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-cdp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";
 	qcom,board-id = <1 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm630-headset-jacktype-no-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-headset-jacktype-no-cdp.dts
index 4db377dc755a..27ef94e8a29a 100644
--- a/arch/arm/boot/dts/qcom/sdm630-headset-jacktype-no-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-headset-jacktype-no-cdp.dts
@@ -22,5 +22,6 @@
 	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";
 	qcom,board-id = <1 2>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts
index baa55fa15160..39099ed1e97e 100644
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts
@@ -22,5 +22,6 @@
 	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";
 	qcom,board-id = <1 1>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts
index b469a59d7818..d9f30b41ed8e 100644
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm630-mtp", "qcom,sdm630", "qcom,mtp";
 	qcom,board-id = <8 1>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &int_codec {
diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts
index c4e71835b701..0ec2e17f10a5 100644
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts
@@ -22,5 +22,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A Int. Audio Codec CDP";
 	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";
 	qcom,board-id = <1 1>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts
index e11cdfbed668..d4f1214dc191 100644
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A Int. Audio Codec MTP";
 	compatible = "qcom,sdm630-mtp", "qcom,sdm630", "qcom,mtp";
 	qcom,board-id = <8 1>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &int_codec {
diff --git a/arch/arm/boot/dts/qcom/sdm630-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-mtp.dts
index b1a9bb86149d..3604ce486633 100644
--- a/arch/arm/boot/dts/qcom/sdm630-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm630-mtp", "qcom,sdm630", "qcom,mtp";
 	qcom,board-id = <8 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts
index 7e3e9a0cca59..a6f01eaa2a43 100644
--- a/arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A CDP";
 	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";
 	qcom,board-id = <1 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm630-pm660a-headset-jacktype-no-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-pm660a-headset-jacktype-no-cdp.dts
index 15936f47da7b..1596f7533581 100644
--- a/arch/arm/boot/dts/qcom/sdm630-pm660a-headset-jacktype-no-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-pm660a-headset-jacktype-no-cdp.dts
@@ -22,5 +22,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A, Headset Jacktype NO, CDP";
 	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";
 	qcom,board-id = <1 2>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts
index a522b7ad1d5f..418b4a1e819f 100644
--- a/arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A MTP";
 	compatible = "qcom,sdm630-mtp", "qcom,sdm630", "qcom,mtp";
 	qcom,board-id = <8 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm630-pm660a-qrd.dts b/arch/arm/boot/dts/qcom/sdm630-pm660a-qrd.dts
index deb10b591444..95b03f68b30f 100644
--- a/arch/arm/boot/dts/qcom/sdm630-pm660a-qrd.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-pm660a-qrd.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A QRD";
 	compatible = "qcom,sdm630-qrd", "qcom,sdm630", "qcom,qrd";
 	qcom,board-id = <0x0002000b 0x00>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &int_codec {
diff --git a/arch/arm/boot/dts/qcom/sdm630-usbc-audio-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-usbc-audio-mtp.dts
index eb089b524fef..309e9c6730a9 100644
--- a/arch/arm/boot/dts/qcom/sdm630-usbc-audio-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-usbc-audio-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm630-mtp", "qcom,sdm630", "qcom,mtp";
 	qcom,board-id = <8 2>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm636-cdp.dts b/arch/arm/boot/dts/qcom/sdm636-cdp.dts
index 47f5eba8f491..ad1cac9c0c90 100644
--- a/arch/arm/boot/dts/qcom/sdm636-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-cdp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm636-cdp", "qcom,sdm636", "qcom,cdp";
 	qcom,board-id = <1 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm636-headset-jacktype-no-cdp.dts b/arch/arm/boot/dts/qcom/sdm636-headset-jacktype-no-cdp.dts
index 4d47ac1ef517..c87ace6938bd 100644
--- a/arch/arm/boot/dts/qcom/sdm636-headset-jacktype-no-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-headset-jacktype-no-cdp.dts
@@ -22,5 +22,6 @@
 	compatible = "qcom,sdm636-cdp", "qcom,sdm636", "qcom,cdp";
 	qcom,board-id = <1 2>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm636-internal-codec-cdp.dts b/arch/arm/boot/dts/qcom/sdm636-internal-codec-cdp.dts
index 725e9739a487..1de6c4c13300 100644
--- a/arch/arm/boot/dts/qcom/sdm636-internal-codec-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-internal-codec-cdp.dts
@@ -22,5 +22,6 @@
 	compatible = "qcom,sdm636-cdp", "qcom,sdm636", "qcom,cdp";
 	qcom,board-id = <1 1>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm636-internal-codec-mtp.dts b/arch/arm/boot/dts/qcom/sdm636-internal-codec-mtp.dts
index 3630e329b13d..3522e67cf87e 100644
--- a/arch/arm/boot/dts/qcom/sdm636-internal-codec-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-internal-codec-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm636-mtp", "qcom,sdm636", "qcom,mtp";
 	qcom,board-id = <8 1>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &int_codec {
diff --git a/arch/arm/boot/dts/qcom/sdm636-internal-codec-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm636-internal-codec-pm660a-cdp.dts
index 416cd3754a10..e51c2e4709d2 100644
--- a/arch/arm/boot/dts/qcom/sdm636-internal-codec-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-internal-codec-pm660a-cdp.dts
@@ -22,5 +22,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 636 PM660 + PM660A Int. Audio Codec CDP";
 	compatible = "qcom,sdm636-cdp", "qcom,sdm636", "qcom,cdp";
 	qcom,board-id = <1 1>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm636-internal-codec-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm636-internal-codec-pm660a-mtp.dts
index e9ad9048c6e9..e4d980a15a0d 100644
--- a/arch/arm/boot/dts/qcom/sdm636-internal-codec-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-internal-codec-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 636 PM660 + PM660A Int. Audio Codec MTP";
 	compatible = "qcom,sdm636-mtp", "qcom,sdm636", "qcom,mtp";
 	qcom,board-id = <8 1>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &int_codec {
diff --git a/arch/arm/boot/dts/qcom/sdm636-mtp.dts b/arch/arm/boot/dts/qcom/sdm636-mtp.dts
index 7f08e44148b5..8ee5c46c804a 100644
--- a/arch/arm/boot/dts/qcom/sdm636-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm636-mtp", "qcom,sdm636", "qcom,mtp";
 	qcom,board-id = <8 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm636-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm636-pm660a-cdp.dts
index 84a28770d5a8..88d19d0c7bb1 100644
--- a/arch/arm/boot/dts/qcom/sdm636-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-pm660a-cdp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 636 PM660 + PM660A CDP";
 	compatible = "qcom,sdm636-cdp", "qcom,sdm636", "qcom,cdp";
 	qcom,board-id = <1 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &mdss_dsi {
diff --git a/arch/arm/boot/dts/qcom/sdm636-pm660a-headset-jacktype-no-cdp.dts b/arch/arm/boot/dts/qcom/sdm636-pm660a-headset-jacktype-no-cdp.dts
index b2517e32ae26..b60fdc773941 100644
--- a/arch/arm/boot/dts/qcom/sdm636-pm660a-headset-jacktype-no-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-pm660a-headset-jacktype-no-cdp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 636 PM660 + PM660A, Headset Jacktype NO, CDP";
 	compatible = "qcom,sdm636-cdp", "qcom,sdm636", "qcom,cdp";
 	qcom,board-id = <1 2>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &mdss_dsi0 {
diff --git a/arch/arm/boot/dts/qcom/sdm636-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm636-pm660a-mtp.dts
index 966a00af7216..6aaa8d070b42 100644
--- a/arch/arm/boot/dts/qcom/sdm636-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 636 PM660 + PM660A MTP";
 	compatible = "qcom,sdm636-mtp", "qcom,sdm636", "qcom,mtp";
 	qcom,board-id = <8 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &mdss_dsi {
diff --git a/arch/arm/boot/dts/qcom/sdm636-pm660a-qrd.dts b/arch/arm/boot/dts/qcom/sdm636-pm660a-qrd.dts
index d8b6c744a204..68734c9cd8c6 100644
--- a/arch/arm/boot/dts/qcom/sdm636-pm660a-qrd.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-pm660a-qrd.dts
@@ -21,7 +21,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 636 PM660 + PM660A QRD";
 	compatible = "qcom,sdm636-qrd", "qcom,sdm636", "qcom,qrd";
 	qcom,board-id = <0x0012000b 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &pm660a_oledb {
diff --git a/arch/arm/boot/dts/qcom/sdm636-qrd.dts b/arch/arm/boot/dts/qcom/sdm636-qrd.dts
index a2d22f281a5d..b1977cdc50bc 100644
--- a/arch/arm/boot/dts/qcom/sdm636-qrd.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-qrd.dts
@@ -21,7 +21,8 @@
 	compatible = "qcom,sdm636-qrd", "qcom,sdm636", "qcom,qrd";
 	qcom,board-id = <0x1000b 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &mdss_mdp {
diff --git a/arch/arm/boot/dts/qcom/sdm636-usbc-audio-mtp.dts b/arch/arm/boot/dts/qcom/sdm636-usbc-audio-mtp.dts
index 90879cdf35cc..8519a4891446 100644
--- a/arch/arm/boot/dts/qcom/sdm636-usbc-audio-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm636-usbc-audio-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm636-mtp", "qcom,sdm636", "qcom,mtp";
 	qcom,board-id = <8 2>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm658-cdp.dts b/arch/arm/boot/dts/qcom/sdm658-cdp.dts
index 8569af157049..223177aece50 100644
--- a/arch/arm/boot/dts/qcom/sdm658-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,6 @@
 	compatible = "qcom,sdm658-cdp", "qcom,sdm658", "qcom,cdp";
 	qcom,board-id = <1 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm658-internal-codec-cdp.dts b/arch/arm/boot/dts/qcom/sdm658-internal-codec-cdp.dts
index d0f5c14223ff..c6cdf6e797af 100644
--- a/arch/arm/boot/dts/qcom/sdm658-internal-codec-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-internal-codec-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,7 +21,8 @@
 	compatible = "qcom,sdm658-cdp", "qcom,sdm658", "qcom,cdp";
 	qcom,board-id = <1 1>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &slim_aud {
diff --git a/arch/arm/boot/dts/qcom/sdm658-internal-codec-mtp.dts b/arch/arm/boot/dts/qcom/sdm658-internal-codec-mtp.dts
index acec15e0615f..32203c9ccaee 100644
--- a/arch/arm/boot/dts/qcom/sdm658-internal-codec-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-internal-codec-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,7 +21,8 @@
 	compatible = "qcom,sdm658-mtp", "qcom,sdm658", "qcom,mtp";
 	qcom,board-id = <8 1>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &slim_aud {
diff --git a/arch/arm/boot/dts/qcom/sdm658-internal-codec-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm658-internal-codec-pm660a-cdp.dts
index b7f2e70ce962..a8d3de6f8962 100644
--- a/arch/arm/boot/dts/qcom/sdm658-internal-codec-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-internal-codec-pm660a-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 658 PM660 + PM660A Int. Audio Codec CDP";
 	compatible = "qcom,sdm658-cdp", "qcom,sdm658", "qcom,cdp";
 	qcom,board-id = <1 1>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm658-internal-codec-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm658-internal-codec-pm660a-mtp.dts
index 949d7ae7faa5..2689dc099f12 100644
--- a/arch/arm/boot/dts/qcom/sdm658-internal-codec-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-internal-codec-pm660a-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 658 PM660 + PM660A Int. Audio Codec MTP";
 	compatible = "qcom,sdm658-mtp", "qcom,sdm658", "qcom,mtp";
 	qcom,board-id = <8 1>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm658-mtp.dts b/arch/arm/boot/dts/qcom/sdm658-mtp.dts
index 2fbe9b0a6201..a57bba3b22af 100644
--- a/arch/arm/boot/dts/qcom/sdm658-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,6 @@
 	compatible = "qcom,sdm658-mtp", "qcom,sdm658", "qcom,mtp";
 	qcom,board-id = <8 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm658-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm658-pm660a-cdp.dts
index 39e2df958347..c719d76613b0 100644
--- a/arch/arm/boot/dts/qcom/sdm658-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-pm660a-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 658 PM660 + PM660A CDP";
 	compatible = "qcom,sdm658-cdp", "qcom,sdm658", "qcom,cdp";
 	qcom,board-id = <1 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm658-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm658-pm660a-mtp.dts
index 4d205ef403f4..4b6b7fa23710 100644
--- a/arch/arm/boot/dts/qcom/sdm658-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-pm660a-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 658 PM660 + PM660A MTP";
 	compatible = "qcom,sdm658-mtp", "qcom,sdm658", "qcom,mtp";
 	qcom,board-id = <8 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm658-pm660a-qrd.dts b/arch/arm/boot/dts/qcom/sdm658-pm660a-qrd.dts
index f1edf6b244a8..cd51a74ba18c 100644
--- a/arch/arm/boot/dts/qcom/sdm658-pm660a-qrd.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-pm660a-qrd.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 658 PM660 + PM660A QRD";
 	compatible = "qcom,sdm658-qrd", "qcom,sdm658", "qcom,qrd";
 	qcom,board-id = <0x1000b 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm658-qrd.dts b/arch/arm/boot/dts/qcom/sdm658-qrd.dts
index bd7d76ee1f6c..155b730d52c3 100644
--- a/arch/arm/boot/dts/qcom/sdm658-qrd.dts
+++ b/arch/arm/boot/dts/qcom/sdm658-qrd.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,6 @@
 	compatible = "qcom,sdm658-qrd", "qcom,sdm658", "qcom,qrd";
 	qcom,board-id = <0x1000b 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm660-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-cdp.dts
index 7b4b68af6188..1b634d7aaf56 100644
--- a/arch/arm/boot/dts/qcom/sdm660-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-cdp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";
 	qcom,board-id = <1 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm660-headset-jacktype-no-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-headset-jacktype-no-cdp.dts
index 48cfefb4cdd0..76755d99f6df 100644
--- a/arch/arm/boot/dts/qcom/sdm660-headset-jacktype-no-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-headset-jacktype-no-cdp.dts
@@ -22,5 +22,6 @@
 	compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";
 	qcom,board-id = <1 2>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-cdp.dts
index 6755385313b1..a7020158c3a5 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-cdp.dts
@@ -22,5 +22,6 @@
 	compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";
 	qcom,board-id = <1 1>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-mtp.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-mtp.dts
index 39da13e7565b..4aeb561e7755 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm660-mtp", "qcom,sdm660", "qcom,mtp";
 	qcom,board-id = <8 1>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &int_codec {
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-cdp.dts
index caf8af514237..780330c80565 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-cdp.dts
@@ -22,5 +22,7 @@
 	model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A Int. Audio Codec CDP";
 	compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";
 	qcom,board-id = <1 1>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-mtp.dts
index d2ae22879ef4..b9c8c900a973 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A Int. Audio Codec MTP";
 	compatible = "qcom,sdm660-mtp", "qcom,sdm660", "qcom,mtp";
 	qcom,board-id = <8 1>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &int_codec {
diff --git a/arch/arm/boot/dts/qcom/sdm660-mtp.dts b/arch/arm/boot/dts/qcom/sdm660-mtp.dts
index 72bfa20b2bf9..32b294ee6883 100644
--- a/arch/arm/boot/dts/qcom/sdm660-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm660-mtp", "qcom,sdm660", "qcom,mtp";
 	qcom,board-id = <8 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {
diff --git a/arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts
index c27f76d3027b..c20318c26373 100644
--- a/arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A CDP";
 	compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";
 	qcom,board-id = <1 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &mdss_dsi {
diff --git a/arch/arm/boot/dts/qcom/sdm660-pm660a-headset-jacktype-no-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-pm660a-headset-jacktype-no-cdp.dts
index 281af3b1768e..5af607c0e1cc 100644
--- a/arch/arm/boot/dts/qcom/sdm660-pm660a-headset-jacktype-no-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-pm660a-headset-jacktype-no-cdp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A, Headset Jacktype NO, CDP";
 	compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";
 	qcom,board-id = <1 2>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &mdss_dsi0 {
diff --git a/arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts
index eb5e4999fb67..3aaa839e18be 100644
--- a/arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts
@@ -22,7 +22,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A MTP";
 	compatible = "qcom,sdm660-mtp", "qcom,sdm660", "qcom,mtp";
 	qcom,board-id = <8 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &mdss_dsi {
diff --git a/arch/arm/boot/dts/qcom/sdm660-pm660a-qrd.dts b/arch/arm/boot/dts/qcom/sdm660-pm660a-qrd.dts
index d9d74ea31d3d..848be11dc0a6 100644
--- a/arch/arm/boot/dts/qcom/sdm660-pm660a-qrd.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-pm660a-qrd.dts
@@ -21,7 +21,9 @@
 	model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A QRD";
 	compatible = "qcom,sdm660-qrd", "qcom,sdm660", "qcom,qrd";
 	qcom,board-id = <0x0012000b 0>;
-	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>,
+			<0x0001001b 0x0002001a 0x0 0x0>,
+			<0x0001001b 0x0202001a 0x0 0x0>;
 };
 
 &pm660a_oledb {
diff --git a/arch/arm/boot/dts/qcom/sdm660-qrd.dts b/arch/arm/boot/dts/qcom/sdm660-qrd.dts
index 4d120e83cb9b..3284e805a093 100644
--- a/arch/arm/boot/dts/qcom/sdm660-qrd.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-qrd.dts
@@ -21,7 +21,8 @@
 	compatible = "qcom,sdm660-qrd", "qcom,sdm660", "qcom,qrd";
 	qcom,board-id = <0x1000b 0>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &mdss_mdp {
diff --git a/arch/arm/boot/dts/qcom/sdm660-usbc-audio-mtp.dts b/arch/arm/boot/dts/qcom/sdm660-usbc-audio-mtp.dts
index dff55d8e9cf8..b1a752b46a41 100644
--- a/arch/arm/boot/dts/qcom/sdm660-usbc-audio-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-usbc-audio-mtp.dts
@@ -22,7 +22,8 @@
 	compatible = "qcom,sdm660-mtp", "qcom,sdm660", "qcom,mtp";
 	qcom,board-id = <8 2>;
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
-			<0x0001001b 0x0201011a 0x0 0x0>;
+			<0x0001001b 0x0201011a 0x0 0x0>,
+			<0x0001001b 0x0102001a 0x0 0x0>;
 };
 
 &tavil_snd {