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

Commit 998e5be1 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 BLSP1 QUP4 on bg-spi node for msm8909"

parents 38afda62 2531797a

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -447,7 +447,7 @@ 
				config {

				config {

					pins = "gpio14";

					pins = "gpio14";

					drive-strength = <2>;

					drive-strength = <2>;

					bias-disable;

					bias-pull-up;

				};

				};

			};

			};

			spi4_cs0_sleep: spi4_cs0_sleep {

			spi4_cs0_sleep: spi4_cs0_sleep {
@@ -458,7 +458,7 @@ 
				config {

				config {

					pins = "gpio14";

					pins = "gpio14";

					drive-strength = <2>;

					drive-strength = <2>;

					bias-disable;

					bias-pull-up;

				};

				};

			};

			};

		};

		};

arch/arm/boot/dts/qcom/msm8909w-bg-wtp-v2.dts

+15 −14
Original line number Original line Diff line number Diff line
@@ -118,6 +118,17 @@ 
			qcom,glinkpkt-dev-name = "glink_pkt_bg_display_ctrl";

			qcom,glinkpkt-dev-name = "glink_pkt_bg_display_ctrl";

		};

		};

	};

	};



	spi@78B8000 {  /* BLSP1 QUP4 */

		status = "ok";

		qcom,bg-spi {

			compatible = "qcom,bg-spi";

			reg = <0>;

			spi-max-frequency = <19200000>;

			interrupt-parent = <&msm_gpio>;

			qcom,irq-gpio = <&msm_gpio 110 1>;

		};

	};

};

};





&i2c_1 {

&i2c_1 {
@@ -132,6 +143,10 @@ 
	status = "disabled";

	status = "disabled";

};

};





&i2c_4 {

	status = "disabled";

};



&i2c_2 {

&i2c_2 {

	status = "disabled";

	status = "disabled";

};

};
@@ -146,20 +161,6 @@ 
	pinctrl-0 = <&uart_console_sleep>;

	pinctrl-0 = <&uart_console_sleep>;

};

};





&soc

{

	spi@78b6000 { /* BLSP1 QUP2 */

		status = "ok";

		qcom,bg-spi {

			compatible = "qcom,bg-spi";

			reg = <0>;

			spi-max-frequency = <19200000>;

			interrupt-parent = <&msm_gpio>;

			qcom,irq-gpio = <&msm_gpio 110 1>;

		};

	};

};



/* Pinctrl dt nodes for interrupt & reset gpio for Synaptics touch controller */

/* Pinctrl dt nodes for interrupt & reset gpio for Synaptics touch controller */

&ts_int_active {

&ts_int_active {

	mux {

	mux {