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

Commit ec65428f authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Andy Gross
Browse files

ARM: dts: move hdmi pinctrl out of board file. 



This patch moves hdmi pinctrl defination from board file to soc level
pinctrl file. If not this pinctrl setup will be duplicated across all
the apq8064 based board files.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent 2bde8880

arch/arm/boot/dts/qcom-apq8064-ifc6410.dts

+0 −22
Original line number Original line Diff line number Diff line
@@ -75,25 +75,6 @@ 
					bias-disable;

					bias-disable;

				};

				};

			};

			};



			hdmi_pinctrl: hdmi-pinctrl {

				mux {

					pins = "gpio70", "gpio71", "gpio72";

					function = "hdmi";

				};



				pinconf_ddc {

					pins = "gpio70", "gpio71";

					bias-pull-up;

					drive-strength = <2>;

				};



				pinconf_hpd {

					pins = "gpio72";

					bias-pull-down;

					drive-strength = <16>;

				};

			};

		};

		};





		rpm@108000 {

		rpm@108000 {
@@ -368,9 +349,6 @@ 




			hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;

			hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;





			pinctrl-names = "default";

			pinctrl-0 = <&hdmi_pinctrl>;



			ports {

			ports {

				port@0 {

				port@0 {

					endpoint {

					endpoint {

arch/arm/boot/dts/qcom-apq8064-pins.dtsi

+19 −0
Original line number Original line Diff line number Diff line
@@ -302,4 +302,23 @@ 
		drive-strength = <6>;

		drive-strength = <6>;

		bias-pull-down;

		bias-pull-down;

	};

	};



	hdmi_pinctrl: hdmi-pinctrl {

		mux {

			pins = "gpio70", "gpio71", "gpio72";

			function = "hdmi";

		};



		pinconf_ddc {

			pins = "gpio70", "gpio71";

			bias-pull-up;

			drive-strength = <2>;

		};



		pinconf_hpd {

			pins = "gpio72";

			bias-pull-down;

			drive-strength = <16>;

		};

	};

};
 
};

arch/arm/boot/dts/qcom-apq8064.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -1355,6 +1355,8 @@ 




		hdmi: hdmi-tx@4a00000 {

		hdmi: hdmi-tx@4a00000 {

			compatible = "qcom,hdmi-tx-8960";

			compatible = "qcom,hdmi-tx-8960";

			pinctrl-names = "default";

			pinctrl-0 = <&hdmi_pinctrl>;

			reg = <0x04a00000 0x2f0>;

			reg = <0x04a00000 0x2f0>;

			reg-names = "core_physical";

			reg-names = "core_physical";

			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;