diff --git a/arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi
index 659cc429ca436..ed388bcb106a7 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
@@ -1191,4 +1172,4 @@
 		qcom,master-en = <1>;		/* Enable GPIO */
 		status = "ok";
 	};
-};
\ No newline at end of file
+};
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi
index 659cc429ca436..ed388bcb106a7 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
@@ -1191,4 +1172,4 @@
 		qcom,master-en = <1>;		/* Enable GPIO */
 		status = "ok";
 	};
-};
\ No newline at end of file
+};
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi
index ec593c743516a..04456448d654c 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -60,26 +57,6 @@
 		"px_ext_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-	#include "pxlw-iris-samsung_s6e3fa3.dtsi"
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-	#include "pxlw-iris-samsung_s6e3fa3.dtsi"
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-	#include "pxlw-iris-samsung_s6e3fa3.dtsi"
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-	#include "pxlw-iris-samsung_s6e3fa3.dtsi"
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi
index a7b10fa19b938..bb0126de3ec2c 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi
index 659cc429ca436..ed388bcb106a7 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
@@ -1191,4 +1172,4 @@
 		qcom,master-en = <1>;		/* Enable GPIO */
 		status = "ok";
 	};
-};
\ No newline at end of file
+};
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi
index 659cc429ca436..ed388bcb106a7 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
@@ -1191,4 +1172,4 @@
 		qcom,master-en = <1>;		/* Enable GPIO */
 		status = "ok";
 	};
-};
\ No newline at end of file
+};
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-panels.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-panels.dtsi
new file mode 100644
index 0000000000000..fff152f3d94d9
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/cheeseburger-panels.dtsi
@@ -0,0 +1,32 @@
+/* Copyright (c) 2015-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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
+#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
+#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
+#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+
+&dsi_samsung_s6e3fa3_1080p_cmd {
+  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
+};
+
+&dsi_samsung_s6e3fa3_1080p_video {
+  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
+};
+
+&dsi_samsung_s6e3fa5_1080p_cmd {
+  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
+};
+
+&dsi_samsung_s6e3fa6_1080p_cmd {
+  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
+};
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi
index 659cc429ca436..ed388bcb106a7 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
@@ -1191,4 +1172,4 @@
 		qcom,master-en = <1>;		/* Enable GPIO */
 		status = "ok";
 	};
-};
\ No newline at end of file
+};
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi
index 659cc429ca436..ed388bcb106a7 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
@@ -1191,4 +1172,4 @@
 		qcom,master-en = <1>;		/* Enable GPIO */
 		status = "ok";
 	};
-};
\ No newline at end of file
+};
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi
index d0b68b5c05f6d..e172a5266da76 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
diff --git a/arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi
index a7b10fa19b938..bb0126de3ec2c 100755
--- a/arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi
@@ -10,10 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi"
-#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi"
-#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi"
+#include "cheeseburger-panels.dtsi"
 
 &mdss_dsi_active {
 	mux {
@@ -55,22 +52,6 @@
 		"byte_intf_clk";
 };
 
-&dsi_samsung_s6e3fa3_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa3_1080p_video {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa5_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
-&dsi_samsung_s6e3fa6_1080p_cmd {
-  qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
-};
-
 /* Charging */
 &soc {
 	tlmm: pinctrl@03400000 {
diff --git a/arch/arm/boot/dts/qcom/cheeseburger.dtsi b/arch/arm/boot/dts/qcom/cheeseburger.dtsi
index b1349bad6c28f..99cc3619e3015 100644
--- a/arch/arm/boot/dts/qcom/cheeseburger.dtsi
+++ b/arch/arm/boot/dts/qcom/cheeseburger.dtsi
@@ -600,9 +600,9 @@
 		qcom,us-euro-gpios = <>;
 		qcom,msm-mbhc-hphl-swh = <1>;
 		qcom,msm-mbhc-gnd-swh = <1>;
-		qcom,wsa-max-devs = <>;
-		qcom,wsa-devs = <>;
-		qcom,wsa-aux-dev-prefix = <>;
+		qcom,wsa-max-devs = <0>;
+		qcom,wsa-devs = <0>;
+		qcom,wsa-aux-dev-prefix = <0>;
 	};
 
 	sound-tavil {
diff --git a/sound/soc/msm/msm8998.c b/sound/soc/msm/msm8998.c
index f4b56005b70f1..8d6b0cb9246dd 100755
--- a/sound/soc/msm/msm8998.c
+++ b/sound/soc/msm/msm8998.c
@@ -6946,8 +6946,7 @@ static int msm_init_wsa_dev(struct platform_device *pdev,
 	char *dev_name_str = NULL;
 	int found = 0;
 	int ret = 0;
-/*wangdongdong@MultiMediaService,add to avoid wsa init*/
-    return ret;
+
 	/* Get maximum WSA device count for this platform */
 	ret = of_property_read_u32(pdev->dev.of_node,
 				   "qcom,wsa-max-devs", &wsa_max_devs);