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

Commit e82605d2 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: enable default panel for 8994"

parents 44442fe3 9b93a6b6

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

+32 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 * GNU General Public License for more details.

 */



#include "msm8994-pinctrl.dtsi"



&sdhc_1 {

	vdd-supply = <&pm8994_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;
@@ -219,6 +221,36 @@ 
	};

};



#include "dsi-panel-sharp-dualmipi0-wqxga-video.dtsi"

#include "dsi-panel-sharp-dualmipi1-wqxga-video.dtsi"

&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&pmx_mdss {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 78>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_dual_sharp_video_0>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active>;

	pinctrl-1 = <&mdss_dsi_suspend>;

	qcom,platform-reset-gpio = <&msm_gpio 78 0>;

	qcom,platform-enable-gpio = <&pm8994_gpios 14 0>;

};



&mdss_dsi1 {

	qcom,dsi-pref-prim-pan = <&dsi_dual_sharp_video_1>;

};



&dsi_dual_sharp_video_0 {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

};



&soc {

	i2c@f9924000 {

		synaptics@20 {

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

+32 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 * GNU General Public License for more details.

 */



#include "msm8994-pinctrl.dtsi"



&sdhc_1 {

	vdd-supply = <&pm8994_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;
@@ -219,6 +221,36 @@ 
	};

};



#include "dsi-panel-sharp-dualmipi0-wqxga-video.dtsi"

#include "dsi-panel-sharp-dualmipi1-wqxga-video.dtsi"

&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&pmx_mdss {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 78>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_dual_sharp_video_0>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active>;

	pinctrl-1 = <&mdss_dsi_suspend>;

	qcom,platform-reset-gpio = <&msm_gpio 78 0>;

	qcom,platform-enable-gpio = <&pm8994_gpios 14 0>;

};



&mdss_dsi1 {

	qcom,dsi-pref-prim-pan = <&dsi_dual_sharp_video_1>;

};



&dsi_dual_sharp_video_0 {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

};



&soc {

	i2c@f9924000 {

		synaptics@20 {

arch/arm/boot/dts/qcom/msm8994-pinctrl.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -65,6 +65,21 @@ 
			};

		};



		pmx_mdss: pmx_mdss {

			label = "mdss-pins";

			qcom,pin-func = <0>;

			mdss_dsi_active: active {

				drive-strength = <8>; /* 8 mA */

				bias-disable = <0>; /* no pull */

				output-high;

			};

			mdss_dsi_suspend: suspend {

				drive-strength = <2>; /* 2 mA */

				bias-pull-down; /* pull down */

				output-low;

			};

		};



		spi_0 {

			qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>;

			qcom,num-grp-pins = <3>;