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

This project is archived. Its data is read-only.

Commit 0519f1dc authored Nov 28, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Nov 28, 2014

Merge "ARM: dts: msm: correct Focaltech CTP irq flag configuration"

parents f1d565e4 2bf3f6c3

arch/arm/boot/dts/qcom/msm8909-qrd-skua.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		compatible = "focaltech,5x06";
		reg = <0x38>;
		interrupt-parent = <&msm_gpio>;
		interrupts = <13 0x2008>;
		interrupts = <13 0x2>;
		vdd-supply = <&pm8909_l17>;
		vcc_i2c-supply = <&pm8909_l6>;
		/* pins used by touchscreen */
		@@ -34,7 +34,7 @@
		focaltech,name = "ft6336";
		focaltech,family-id = <0x36>;
		focaltech,reset-gpio = <&msm_gpio 12 0x0>;
		focaltech,irq-gpio = <&msm_gpio 13 0x2008>;
		focaltech,irq-gpio = <&msm_gpio 13 0x0>;
		focaltech,display-coords = <0 0 480 854>;
		focaltech,panel-coords = <0 0 480 950>;
		focaltech,button-map= <139 102 158>;

arch/arm/boot/dts/qcom/msm8909-qrd-skuc.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@
		compatible = "focaltech,5x06";
		reg = <0x38>;
		interrupt-parent = <&msm_gpio>;
		interrupts = <13 0x2008>;
		interrupts = <13 0x2>;
		vdd-supply = <&pm8909_l17>;
		vcc_i2c-supply = <&pm8909_l6>;
		/* pins used by touchscreen */
		@@ -71,7 +71,7 @@
		focaltech,name = "ft6436";
		focaltech,family-id = <0x36>;
		focaltech,reset-gpio = <&msm_gpio 12 0x0>;
		focaltech,irq-gpio = <&msm_gpio 13 0x2008>;
		focaltech,irq-gpio = <&msm_gpio 13 0x0>;
		focaltech,display-coords = <0 0 480 854>;
		focaltech,panel-coords = <0 0 480 950>;
		focaltech,no-force-update;

arch/arm/boot/dts/qcom/msm8909-qrd-skue.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		compatible = "focaltech,5x06";
		reg = <0x38>;
		interrupt-parent = <&msm_gpio>;
		interrupts = <13 0x2008>;
		interrupts = <13 0x2>;
		vdd-supply = <&pm8909_l17>;
		vcc_i2c-supply = <&pm8909_l6>;
		/* pins used by touchscreen */
		@@ -34,7 +34,7 @@
		focaltech,name = "ft6306";
		focaltech,family-id = <0x36>;
		focaltech,reset-gpio = <&msm_gpio 12 0x0>;
		focaltech,irq-gpio = <&msm_gpio 13 0x2008>;
		focaltech,irq-gpio = <&msm_gpio 13 0x0>;
		focaltech,display-coords = <0 0 480 854>;
		focaltech,panel-coords = <0 0 480 950>;
		focaltech,button-map= <139 102 158>;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@
		compatible = "focaltech,5x06";
		reg = <0x38>;
		interrupt-parent = <&msm_gpio>;
		interrupts = <13 0x2008>;
		interrupts = <13 0x2>;
		vdd-supply = <&pm8916_l17>;
		vcc_i2c-supply = <&pm8916_l6>;
		/* pins used by touchscreen */
		@@ -56,7 +56,7 @@
		focaltech,name = "ft6436";
		focaltech,family-id = <0x36>;
		focaltech,reset-gpio = <&msm_gpio 12 0x0>;
		focaltech,irq-gpio = <&msm_gpio 13 0x2008>;
		focaltech,irq-gpio = <&msm_gpio 13 0x0>;
		focaltech,display-coords = <0 0 480 854>;
		focaltech,panel-coords = <0 0 480 950>;
		focaltech,button-map= <139 102 158>;

drivers/input/touchscreen/ft5x06_ts.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1951,6 +1951,10 @@ static int ft5x06_ts_probe(struct i2c_client *client,

		err = request_threaded_irq(client->irq, NULL,
		ft5x06_ts_interrupt,
		/*
		* the interrupt trigger mode will be set in Device Tree with property
		* "interrupts", so here we just need to set the flag IRQF_ONESHOT
		*/
		IRQF_ONESHOT,
		client->dev.driver->name, data);
		if (err) {