summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-19 17:04:50 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-19 17:04:50 -0800
commit5c097356593addad1a7830943de79e21a3eb5dd2 (patch)
treec550448ab9347e947f8b9f2a6abc1d988c6e0d7f
parent28f5a82fc0ce0aa01566062db684b0fabc7b072a (diff)
parent749935230e8baa591f559ee9e4d59cbdad2972a3 (diff)
Merge "ARM: dts: msm: Enable Gm control for pm2falcon"
-rw-r--r--arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi1
-rw-r--r--arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-cdp.dts4
-rw-r--r--arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-mtp.dts4
3 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi b/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi
index 0f5c12856cc0..087a7c765da8 100644
--- a/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi
@@ -252,6 +252,7 @@
qcom,en-phase-stag;
qcom,led-strings-list = [00 01 02];
qcom,en-ext-pfet-sc-pro;
+ qcom,loop-auto-gm-en;
qcom,pmic-revid = <&pm2falcon_revid>;
status = "ok";
};
diff --git a/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-cdp.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-cdp.dts
index e88ee107e280..5ea248f6f2dc 100644
--- a/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-cdp.dts
@@ -149,3 +149,7 @@
qcom,platform-te-gpio = <&tlmm 10 0>;
qcom,panel-mode-gpio = <&tlmm 91 0>;
};
+
+&pm2falcon_wled {
+ qcom,led-strings-list = [01 02];
+};
diff --git a/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-mtp.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-mtp.dts
index ccc94307277d..7c0c53033a44 100644
--- a/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-mtp.dts
@@ -178,3 +178,7 @@
};
};
};
+
+&pm2falcon_wled {
+ qcom,led-strings-list = [01 02];
+};