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

Commit dab91443 authored by Prasad Sodagudi's avatar Prasad Sodagudi Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: Convert all pinctrl nodes of msm8952 for 3.18 kernel 



Convert all pinctrl nodes of msm8952 in accordance to the new
binding guidelines for pingroups and mux settings in 3.18 kernel.

The guidelines are mentioned in -
Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

Change-Id: I13fa3be3f89767e715918699468fe30478de97d9
Signed-off-by: default avatarPrasad Sodagudi <psodagud@codeaurora.org>
parent 2c22cfee

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

+62 −10
Original line number Diff line number Diff line
@@ -183,10 +183,29 @@ 
	};

};



&tlmm_pinmux {

&msm_gpio {

	tlmm_gpio_key {

		qcom,pins = <&gp 85>, <&gp 86>, <&gp 87>, <&gp 88>;

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

		gpio_key_active: gpio_key_active {

			mux {

				pins = "gpio85", "gpio86", "gpio87", "gpio88";

				function = "gpio";

			};



			config {

				pins = "gpio85", "gpio86", "gpio87", "gpio88";

			};

		};



		gpio_key_suspend: gpio_key_suspend {

			mux {

				pins = "gpio85", "gpio86", "gpio87", "gpio88";

				function = "gpio";

			};



			config {

				pins = "gpio85", "gpio86", "gpio87", "gpio88";

			};

		};

	};

};
@@ -285,14 +304,47 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};



&pmx_mdss {

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

	qcom,pins = <&gp 90>, <&gp 0>, <&gp 91>;

&msm_gpio {

	pmx_mdss {

		mdss_dsi_active: mdss_dsi_active {

			mux {

				pins = "gpio90", "gpio0", "gpio91";

			};



			config {

				pins = "gpio90", "gpio0", "gpio91";

			};

		};

		mdss_dsi_suspend: mdss_dsi_suspend {

			mux {

				pins = "gpio90", "gpio0", "gpio91";

			};



&pmx_mdss_te {

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

	qcom,pins = <&gp 24>;

			config {

				pins = "gpio90", "gpio0", "gpio91";

			};

		};

	};



	pmx_mdss_te {

		mdss_te_active: mdss_te_active {

			mux {

				pins = "gpio24";

			};

			config {

				pins = "gpio24";

			};

		};



		mdss_te_suspend: mdss_te_suspend {

			mux {

				pins = "gpio24";

			};

			config {

				pins = "gpio24";

			};

		};

	};

};



&mdss_dsi0 {

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

+43 −7
Original line number Diff line number Diff line
@@ -285,14 +285,50 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};



&pmx_mdss {

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

	qcom,pins = <&gp 90>, <&gp 0>, <&gp 91>;

&msm_gpio {

	pmx_mdss {

		mdss_dsi_active: mdss_dsi_active {

			mux {

				pins = "gpio90", "gpio0", "gpio91";

			};



&pmx_mdss_te {

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

	qcom,pins = <&gp 24>;

			config {

				pins = "gpio90", "gpio0", "gpio91";

			};

		};



		mdss_dsi_suspend: mdss_dsi_suspend {

			mux {

				pins = "gpio90", "gpio0", "gpio91";

			};



			config {

				pins = "gpio90", "gpio0", "gpio91";

			};

		};

	};



	pmx_mdss_te {

		mdss_te_active: mdss_te_active {

			mux {

				pins = "gpio24";

			};



			config {

				pins = "gpio24";

			};

		};



		mdss_te_suspend: mdss_te_suspend {

			mux {

				pins = "gpio24";

			};



			config {

				pins = "gpio24";

			};

		};

	};

};



&mdss_dsi0 {

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

+1231 −786

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/qcom/msm8952-qrd-skum.dtsi

+63 −10
Original line number Diff line number Diff line
@@ -167,10 +167,29 @@ 
	};

};



&tlmm_pinmux {

&msm_gpio {

	tlmm_gpio_key {

		qcom,pins = <&gp 85>, <&gp 93>;

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

		gpio_key_active: gpio_key_active {

			mux {

				pins = "gpio85", "gpio93";

				function = "gpio";

			};



			config {

				pins = "gpio85", "gpios93";

			};

		};



		gpio_key_suspend: gpio_key_suspend {

			mux {

				pins = "gpio85", "gpio93";

				function = "gpio";

			};



			config {

				pins = "gpio85", "gpios93";

			};

		};

	};

};
@@ -201,14 +220,48 @@ 
	qcom,mdss-pref-prim-intf = "dsi";

};



&pmx_mdss {

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

	qcom,pins = <&gp 0>;

&msm_gpio {

	pmx_mdss {

		mdss_dsi_active: mdss_dsi_active {

			mux {

				pins = "gpio0";

			};

			config {

				pins = "gpio0";

			};

		};



		mdss_dsi_suspend: mdss_dsi_suspend {

			mux {

				pins = "gpio0";

			};

			config {

				pins = "gpio0";

			};

		};



	};



&pmx_mdss_te {

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

	qcom,pins = <&gp 24>;

	pmx_mdss_te {

		mdss_te_active: mdss_te_active {

			mux {

				qcom,pins = "gpio24";

			};

			config {

				qcom,pins = "gpio24";

			};

		};



		mdss_te_suspend: mdss_te_suspend {

			mux {

				qcom,pins = "gpio24";

			};

			config {

				qcom,pins = "gpio24";

			};

		};



	};

};



&mdss_dsi0 {