Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53aba167 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents b2b4bbae 13d17180

arch/arm/boot/dts/qcom/dsi-panel-sharp-dualmipi-1080p-120hz.dtsi

+1 −2
Original line number Diff line number Diff line 
/* 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>;

arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/qcom/msmcobalt-mdss-panels.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -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>;

};

arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -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";

};