Merge cherrypicks of [7014754] into oc-mr1-1.5-iot-release

Change-Id: Ic2f746b752ed9cf03cedef77fccc267d718ef352
diff --git a/arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.2.3.dtsi b/arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.2.3.dtsi
index 3d2a591..629c4f9 100644
--- a/arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.2.3.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.2.3.dtsi
@@ -114,7 +114,7 @@
 
 	qcom,platform-te-gpio = <&tlmm 24 0>;
 	qcom,platform-reset-gpio = <&tlmm 61 0>;
-	qcom,ext_vdd-gpio = <&tlmm 100 0>;
+	qcom,ext-vdd-gpio = <&tlmm 100 0>;
 	qcom,platform-bklight-en-gpio = <&tlmm 95 0>;
 
 	qcom,platform-lane-config = [00 00 ff 0f
diff --git a/arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.2.4.dtsi b/arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.2.4.dtsi
index 70b4e9c..23f1dc5 100644
--- a/arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.2.4.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.2.4.dtsi
@@ -114,7 +114,7 @@
 
 	qcom,platform-te-gpio = <&tlmm 24 0>;
 	qcom,platform-reset-gpio = <&tlmm 61 0>;
-	qcom,ext_vdd-gpio = <&tlmm 100 0>;
+	qcom,ext-vdd-gpio = <&tlmm 100 0>;
 	qcom,platform-bklight-en-gpio = <&tlmm 95 0>;
 
 	qcom,platform-lane-config = [00 00 ff 0f