summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-07 13:13:30 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-07 13:13:29 -0700
commit9dc0febd0581fb4265f4c245d323198533adcbf4 (patch)
tree8f201e076eff41656daf08eca2c862a62ae3af58 /arch/arm
parent4c6e5c55cde78bc1d2ca24409441d5905c34b528 (diff)
parent6726b980b62d8c6b0b8abc8e5d1c7215d4fd84f8 (diff)
Merge "ARM: dts: msm: control avdd enable gpio for msm8998 QVR/SKUK HDK"
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/qcom/msm8998-qrd-skuk-hdk.dtsi10
-rw-r--r--arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi10
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998-qrd-skuk-hdk.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk-hdk.dtsi
index 3c76519acdcf..7809b81fcefd 100644
--- a/arch/arm/boot/dts/qcom/msm8998-qrd-skuk-hdk.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk-hdk.dtsi
@@ -87,8 +87,8 @@
qcom,platform-te-gpio = <&tlmm 10 0>;
qcom,platform-enable-gpio = <&tlmm 52 0>;
qcom,platform-reset-gpio = <&tlmm 94 0>;
- qcom,platform-bklight-en-gpio = <&pmi8998_gpios 1 0>;
- qcom,platform-bklight-en-gpio-invert;
+ qcom,platform-avdd-en-gpio = <&pmi8998_gpios 1 0>;
+ qcom,platform-avdd-en-gpio-invert;
};
&mdss_dsi1 {
@@ -99,8 +99,8 @@
qcom,platform-te-gpio = <&tlmm 10 0>;
qcom,platform-enable-gpio = <&tlmm 52 0>;
qcom,platform-reset-gpio = <&tlmm 94 0>;
- qcom,platform-bklight-en-gpio = <&pmi8998_gpios 1 0>;
- qcom,platform-bklight-en-gpio-invert;
+ qcom,platform-avdd-en-gpio = <&pmi8998_gpios 1 0>;
+ qcom,platform-avdd-en-gpio-invert;
};
&pmi8998_wled {
@@ -114,7 +114,7 @@
};
&pmi8998_gpios {
- /* GPIO 1 for WLED power enable */
+ /* GPIO 1 for AVDD power enable */
gpio@c000 {
qcom,mode = <1>;
qcom,output-type = <0>;
diff --git a/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi
index 0d0c66d7f26e..9b1145242cc0 100644
--- a/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi
@@ -420,8 +420,8 @@
qcom,platform-te-gpio = <&tlmm 10 0>;
qcom,platform-enable-gpio = <&tlmm 52 0>;
qcom,platform-reset-gpio = <&tlmm 94 0>;
- qcom,platform-bklight-en-gpio = <&pmi8998_gpios 1 0>;
- qcom,platform-bklight-en-gpio-invert;
+ qcom,platform-avdd-en-gpio = <&pmi8998_gpios 1 0>;
+ qcom,platform-avdd-en-gpio-invert;
};
&mdss_dsi1 {
@@ -432,8 +432,8 @@
qcom,platform-te-gpio = <&tlmm 10 0>;
qcom,platform-enable-gpio = <&tlmm 52 0>;
qcom,platform-reset-gpio = <&tlmm 94 0>;
- qcom,platform-bklight-en-gpio = <&pmi8998_gpios 1 0>;
- qcom,platform-bklight-en-gpio-invert;
+ qcom,platform-avdd-en-gpio = <&pmi8998_gpios 1 0>;
+ qcom,platform-avdd-en-gpio-invert;
};
&pmi8998_wled {
@@ -447,7 +447,7 @@
};
&pmi8998_gpios {
- /* GPIO 1 for WLED power enable */
+ /* GPIO 1 for AVDD power enable */
gpio@c000 {
qcom,mode = <1>;
qcom,output-type = <0>;