Merge "ARM: dts: msm: add PMI GPIO1 to control WLED for msm8998 QVR"

This commit is contained in:
Linux Build Service Account 2017-01-12 22:39:05 -08:00 committed by Gerrit - the friendly Code Review server
commit 075893a011
2 changed files with 99 additions and 0 deletions

View file

@ -30,6 +30,7 @@
#include "dsi-panel-sim-cmd.dtsi"
#include "dsi-panel-sim-dualmipi-video.dtsi"
#include "dsi-panel-sim-dualmipi-cmd.dtsi"
#include "dsi-panel-s6e3ha3-amoled-dualmipi-wqhd-cmd.dtsi"
&soc {
dsi_panel_pwr_supply: dsi_panel_pwr_supply {
@ -189,3 +190,9 @@
qcom,mdss-dsi-t-clk-post = <0x06>;
qcom,mdss-dsi-t-clk-pre = <0x22>;
};
&dsi_dual_s6e3ha3_amoled_cmd {
qcom,mdss-dsi-panel-timings = [00 1c 06 06 0b 10 06 07 05 03 04 00];
qcom,mdss-dsi-t-clk-post = <0x07>;
qcom,mdss-dsi-t-clk-pre = <0x2a>;
};

View file

@ -343,3 +343,95 @@
qcom,ramp-step-ms = <255>;
qcom,use-blink;
};
&pmx_mdss {
mdss_dsi_active: mdss_dsi_active {
mux {
pins = "gpio52", "gpio94";
function = "gpio";
};
config {
pins = "gpio52", "gpio94";
drive-strength = <8>; /* 8 mA */
bias-disable = <0>; /* no pull */
};
};
mdss_dsi_suspend: mdss_dsi_suspend {
mux {
pins = "gpio52", "gpio94";
function = "gpio";
};
config {
pins = "gpio52", "gpio94";
drive-strength = <2>; /* 2 mA */
bias-pull-down; /* pull down */
};
};
};
&mdss_mdp {
qcom,mdss-pref-prim-intf = "dsi";
};
&mdss_dsi {
hw-config = "split_dsi";
};
&mdss_dsi0 {
qcom,dsi-pref-prim-pan = <&dsi_dual_s6e3ha3_amoled_cmd>;
pinctrl-names = "mdss_default", "mdss_sleep";
pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
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;
};
&mdss_dsi1 {
qcom,dsi-pref-prim-pan = <&dsi_dual_s6e3ha3_amoled_cmd>;
pinctrl-names = "mdss_default", "mdss_sleep";
pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
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;
};
&pmi8998_wled {
qcom,disp-type-amoled;
};
&labibb {
status = "ok";
qcom,qpnp-labibb-mode = "amoled";
qcom,swire-control;
};
&pmi8998_gpios {
/* GPIO 1 for WLED power enable */
gpio@c000 {
qcom,mode = <1>;
qcom,output-type = <0>;
qcom,pull = <5>;
qcom,vin-sel = <0>;
qcom,out-strength = <1>;
qcom,src-sel = <0>;
qcom,invert = <0>;
qcom,master-en = <1>;
status = "okay";
};
};
&dsi_dual_s6e3ha3_amoled_cmd {
qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
qcom,mdss-dsi-bl-min-level = <1>;
qcom,mdss-dsi-bl-max-level = <255>;
qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};