Merge "ARM: dts: msm: add sharp 120 Hz panel support for msmcobalt"

This commit is contained in:
Linux Build Service Account 2016-09-20 10:20:37 -07:00 committed by Gerrit - the friendly Code Review server
commit 53aba1677d
4 changed files with 22 additions and 2 deletions

View file

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2016, 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
@ -16,7 +16,6 @@
"sharp 1080p 120hz dual dsi cmd mode panel";
qcom,mdss-dsi-panel-type = "dsi_cmd_mode";
qcom,mdss-dsi-panel-framerate = <120>;
qcom,mdss-dsi-panel-clockrate = <975000000>;
qcom,mdss-dsi-virtual-channel-id = <0>;
qcom,mdss-dsi-stream = <0>;
qcom,mdss-dsi-panel-width = <540>;

View file

@ -393,6 +393,13 @@
qcom,5v-boost-gpio = <&tlmm 51 0>;
};
&dsi_dual_sharp_1080_120hz_cmd {
qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
qcom,mdss-dsi-bl-min-level = <1>;
qcom,mdss-dsi-bl-max-level = <4095>;
qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};
&mdss_hdmi_tx {
pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active", "hdmi_cec_active",
"hdmi_active", "hdmi_sleep";

View file

@ -24,6 +24,7 @@
#include "dsi-panel-jdi-dualmipi-cmd.dtsi"
#include "dsi-panel-sharp-1080p-cmd.dtsi"
#include "dsi-panel-jdi-1080p-video.dtsi"
#include "dsi-panel-sharp-dualmipi-1080p-120hz.dtsi"
&soc {
dsi_panel_pwr_supply: dsi_panel_pwr_supply {
@ -149,3 +150,9 @@
qcom,mdss-dsi-t-clk-post = <0x07>;
qcom,mdss-dsi-t-clk-pre = <0x28>;
};
&dsi_dual_sharp_1080_120hz_cmd {
qcom,mdss-dsi-panel-timings = [00 19 05 06 0a 0f 05 06 05 03 04 00];
qcom,mdss-dsi-t-clk-post = <0x7>;
qcom,mdss-dsi-t-clk-pre = <0x26>;
};

View file

@ -444,6 +444,13 @@
qcom,5v-boost-gpio = <&tlmm 51 0>;
};
&dsi_dual_sharp_1080_120hz_cmd {
qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
qcom,mdss-dsi-bl-min-level = <1>;
qcom,mdss-dsi-bl-max-level = <4095>;
qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};
&pmicobalt_haptics {
status = "okay";
};