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

Commit 45e239cc 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 pinctrl support in mdss for msm8916"

parents c43b877b 9736c327

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

+15 −0
Original line number Diff line number Diff line
@@ -119,3 +119,18 @@ 
		status = "disabled";

	};

};



&pmx_mdss {

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

                qcom,pins = <&gp 97>, <&gp 25>, <&gp 98>;

};



&mdss_dsi0 {

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

                pinctrl-0 = <&mdss_dsi_active>;

                pinctrl-1 = <&mdss_dsi_suspend>;



                qcom,platform-enable-gpio = <&msm_gpio 97 0>;

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

                qcom,platform-bklight-en-gpio = <&msm_gpio 98 0>;

};

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

+15 −0
Original line number Diff line number Diff line
@@ -119,3 +119,18 @@ 
		status = "disabled";

	};

};



&pmx_mdss {

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

                qcom,pins = <&gp 97>, <&gp 25>, <&gp 98>;

};



&mdss_dsi0 {

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

                pinctrl-0 = <&mdss_dsi_active>;

                pinctrl-1 = <&mdss_dsi_suspend>;



                qcom,platform-enable-gpio = <&msm_gpio 97 0>;

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

                qcom,platform-bklight-en-gpio = <&msm_gpio 98 0>;

};

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

+13 −0
Original line number Diff line number Diff line
@@ -415,5 +415,18 @@ 
				drive-strength = <3>; /* 3 MA */

			};

		};

		pmx_mdss: pmx_mdss {

			label = "mdss-pins";

			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;

			};

		};

	};

};

arch/arm/boot/dts/qcom/msm8916-sim.dts

+15 −0
Original line number Diff line number Diff line
@@ -104,3 +104,18 @@ 


	status = "ok";

};



&pmx_mdss {

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

		qcom,pins = <&gp 24>, <&gp 25>, <&gp 98>;

};



&mdss_dsi0 {

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

		pinctrl-0 = <&mdss_dsi_active>;

		pinctrl-1 = <&mdss_dsi_suspend>;



		qcom,platform-enable-gpio = <&msm_gpio 24 0>;

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

		qcom,platform-bklight-en-gpio = <&msm_gpio 98 0>;

};
 
 No newline at end of file