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

Commit 113bdddf 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 release pinctrl state for touchscreen GPIOs"

parents 8442a072 115d9497

arch/arm/boot/dts/qcom/msm8916-qrd-skui.dtsi

+2 −1
Original line number Original line Diff line number Diff line
@@ -23,9 +23,10 @@ 
			vdd-supply = <&pm8916_l17>;

			vdd-supply = <&pm8916_l17>;

			vcc_i2c-supply = <&pm8916_l6>;

			vcc_i2c-supply = <&pm8916_l6>;

			/* pins used by touchscreen */

			/* pins used by touchscreen */

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend";

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			pinctrl-2 = <&ts_release>;

			focaltech,name = "ft6436";

			focaltech,name = "ft6436";

			focaltech,family-id = <0x36>;

			focaltech,family-id = <0x36>;

			focaltech,reset-gpio = <&msm_gpio 12 0x0>;

			focaltech,reset-gpio = <&msm_gpio 12 0x0>;

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -447,6 +447,17 @@ 
			};

			};

		};

		};





		pmx_ts_release {

			qcom,pins = <&gp 13>, <&gp 12>;

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

			label = "pmx_ts_release";



			ts_release: ts_release {

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		apds99xx_int_pin {

		apds99xx_int_pin {

			/* Ambient light and proximity sensor apds9930 and apds9900 */

			/* Ambient light and proximity sensor apds9930 and apds9900 */

			qcom,pins = <&gp 113>;

			qcom,pins = <&gp 113>;

arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dtsi

+2 −1
Original line number Original line Diff line number Diff line
@@ -28,9 +28,10 @@ 
			vdd-supply = <&pm8916_l17>;

			vdd-supply = <&pm8916_l17>;

			vcc_i2c-supply = <&pm8916_l6>;

			vcc_i2c-supply = <&pm8916_l6>;

			/* pins used by touchscreen */

			/* pins used by touchscreen */

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend";

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			pinctrl-2 = <&ts_release>;

			focaltech,name = "ft5336";

			focaltech,name = "ft5336";

			focaltech,family-id = <0x14>;

			focaltech,family-id = <0x14>;

			focaltech,reset-gpio = <&msm_gpio 12 0x0>;

			focaltech,reset-gpio = <&msm_gpio 12 0x0>;