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

Commit 387e9dc0 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 default display for sdmshrike" into msm-4.14

parents f8c2a9c0 58c732c4

arch/arm64/boot/dts/qcom/sdmshrike-cdp.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include "sdmshrike-sde-display.dtsi"



#include "sdmshrike-pmic-overlay.dtsi"
@@ -51,6 +52,32 @@ 
	status = "ok";

};



&dsi_sharp_4k_dsc_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	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,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 6 0>;

	qcom,platform-te-gpio = <&tlmm 8 0>;

	qcom,platform-reset-gpio = <&tlmm 7 0>;

};



&dsi_sharp_4k_dsc_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	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,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 6 0>;

	qcom,platform-te-gpio = <&tlmm 8 0>;

	qcom,platform-reset-gpio = <&tlmm 7 0>;

};



&dsi_sharp_4k_dsc_cmd_display {

	qcom,dsi-display-active;

};



&pm855l_lcdb {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sdmshrike-mtp.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include "sdmshrike-sde-display.dtsi"



#include "sdmshrike-pmic-overlay.dtsi"
@@ -51,6 +52,32 @@ 
	status = "ok";

};



&dsi_sharp_4k_dsc_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	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,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 6 0>;

	qcom,platform-te-gpio = <&tlmm 8 0>;

	qcom,platform-reset-gpio = <&tlmm 7 0>;

};



&dsi_sharp_4k_dsc_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	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,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 6 0>;

	qcom,platform-te-gpio = <&tlmm 8 0>;

	qcom,platform-reset-gpio = <&tlmm 7 0>;

};



&dsi_sharp_4k_dsc_cmd_display {

	qcom,dsi-display-active;

};



&pm855l_lcdb {

	status = "ok";

};