[PATCH 0/2] ARM: dts: AM43xx: Touchscreen support

[PATCH 0/2] ARM: dts: AM43xx: Touchscreen support

[Roger Quadros]

Hi Benoit & Tony,

These patches add I2C touch screen support for am43x-epos-evm
and am437x-gp-evm.

Relevant driver side changes are here.
http://thread.gmane.org/gmane.linux.kernel.input/35803

Please queue this for -next (3.16). Thanks.

cheers,
-roger

---
Roger Quadros (1):
  ARM: dts: am43x-epos-evm: Correct Touch controller info

Sekhar Nori (1):
  ARM: dts: AM437x: Add touchscreen support for GP EVM

 arch/arm/boot/dts/am437x-gp-evm.dts  | 20 ++++++++++++++++++++
 arch/arm/boot/dts/am43x-epos-evm.dts | 12 ++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

-- 
1.8.3.2

[PATCH 1/2] ARM: dts: am43x-epos-evm: Correct Touch controller info

[Roger Quadros]

Fixup Y resolution and add default pin state. Also update
the compatible id.

CC: Benoit Cousson <bcousson@baylibre.com>
CC: Tony Lindgren <tony@atomide.com>
CC: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/am43x-epos-evm.dts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 167dbc8..3a067e6 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -138,6 +138,12 @@
 				0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
 			>;
 		};
+
+		pixcir_ts_pins: pixcir_ts_pins {
+			pinctrl-single,pins = <
+				0x44 (PIN_INPUT_PULLUP | MUX_MODE7)	/* gpmc_a1.gpio1_17 */
+			>;
+		};
 	};
 
 	matrix_keypad: matrix_keypad@0 {
@@ -226,7 +232,9 @@
 	};
 
 	pixcir_ts@5c {
-		compatible = "pixcir,pixcir_ts";
+		compatible = "pixcir,pixcir_tangoc";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pixcir_ts_pins>;
 		reg = <0x5c>;
 		interrupt-parent = <&gpio1>;
 		interrupts = <17 0>;
@@ -234,7 +242,7 @@
 		attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;
 
 		x-size = <1024>;
-		y-size = <768>;
+		y-size = <600>;
 	};
 };
 
-- 
1.8.3.2

[PATCH v2 1/2] ARM: dts: am43x-epos-evm: Correct Touch controller info

[Roger Quadros]

From: Roger Quadros <rogerq@ti.com>

Fixup Y resolution and add default pin state. Also update
the compatible id and bindings for touchscreen size.

CC: Benoit Cousson <bcousson@baylibre.com>
CC: Tony Lindgren <tony@atomide.com>
CC: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/am43x-epos-evm.dts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 167dbc8..b789e2d 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -138,6 +138,12 @@
 				0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
 			>;
 		};
+
+		pixcir_ts_pins: pixcir_ts_pins {
+			pinctrl-single,pins = <
+				0x44 (PIN_INPUT_PULLUP | MUX_MODE7)	/* gpmc_a1.gpio1_17 */
+			>;
+		};
 	};
 
 	matrix_keypad: matrix_keypad@0 {
@@ -226,15 +232,17 @@
 	};
 
 	pixcir_ts@5c {
-		compatible = "pixcir,pixcir_ts";
+		compatible = "pixcir,pixcir_tangoc";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pixcir_ts_pins>;
 		reg = <0x5c>;
 		interrupt-parent = <&gpio1>;
 		interrupts = <17 0>;
 
 		attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;
 
-		x-size = <1024>;
-		y-size = <768>;
+		touchscreen-size-x = <1024>;
+		touchscreen-size-y = <600>;
 	};
 };
 
-- 
1.8.3.2

[PATCH 2/2] ARM: dts: AM437x: Add touchscreen support for GP EVM

[Roger Quadros]

From: Sekhar Nori <nsekhar@ti.com>

Add touchscreen support for AM437x GP EVM using pixcir
touchscreen controller.

CC: Benoit Cousson <bcousson@baylibre.com>
CC: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/am437x-gp-evm.dts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index df8798e..bc9889f 100644
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -81,6 +81,12 @@
 			0x164 MUX_MODE0       /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
 		>;
 	};
+
+	pixcir_ts_pins: pixcir_ts_pins {
+		pinctrl-single,pins = <
+			0x264 (PIN_INPUT_PULLUP | MUX_MODE7)  /* spi2_d0.gpio3_22 */
+		>;
+	};
 };
 
 &i2c0 {
@@ -93,6 +99,20 @@
         status = "okay";
         pinctrl-names = "default";
         pinctrl-0 = <&i2c1_pins>;
+
+	pixcir_ts@5c {
+		compatible = "pixcir,pixcir_tangoc";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pixcir_ts_pins>;
+		reg = <0x5c>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <22 0>;
+
+		attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+
+		x-size = <1024>;
+		y-size = <600>;
+	};
 };
 
 &epwmss0 {
-- 
1.8.3.2

[PATCH v2 2/2] ARM: dts: AM437x: Add touchscreen support for GP EVM

[Roger Quadros]

From: Sekhar Nori <nsekhar@ti.com>

Add touchscreen support for AM437x GP EVM using pixcir
touchscreen controller.

[Roger Q] - Updated bindings for touchscreen size.

CC: Benoit Cousson <bcousson@baylibre.com>
CC: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/am437x-gp-evm.dts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index df8798e..64cd344 100644
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -81,6 +81,12 @@
 			0x164 MUX_MODE0       /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
 		>;
 	};
+
+	pixcir_ts_pins: pixcir_ts_pins {
+		pinctrl-single,pins = <
+			0x264 (PIN_INPUT_PULLUP | MUX_MODE7)  /* spi2_d0.gpio3_22 */
+		>;
+	};
 };
 
 &i2c0 {
@@ -93,6 +99,20 @@
         status = "okay";
         pinctrl-names = "default";
         pinctrl-0 = <&i2c1_pins>;
+
+	pixcir_ts@5c {
+		compatible = "pixcir,pixcir_tangoc";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pixcir_ts_pins>;
+		reg = <0x5c>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <22 0>;
+
+		attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+
+		touchscreen-size-x = <1024>;
+		touchscreen-size-y = <600>;
+	};
 };
 
 &epwmss0 {
-- 
1.8.3.2

Re: [PATCH 0/2] ARM: dts: AM43xx: Touchscreen support

[Tony Lindgren]

* Roger Quadros <rogerq@ti.com> [140430 05:43]:
> Hi Benoit & Tony,
> 
> These patches add I2C touch screen support for am43x-epos-evm
> and am437x-gp-evm.
> 
> Relevant driver side changes are here.
> http://thread.gmane.org/gmane.linux.kernel.input/35803
> 
> Please queue this for -next (3.16). Thanks.

Applying both into omap-for-v3.16/dt thanks.

Tony

Re: [PATCH 0/2] ARM: dts: AM43xx: Touchscreen support

[Roger Quadros]

Hi Tony,

On 05/06/2014 07:39 PM, Tony Lindgren wrote:
> * Roger Quadros <rogerq@ti.com> [140430 05:43]:
>> Hi Benoit & Tony,
>>
>> These patches add I2C touch screen support for am43x-epos-evm
>> and am437x-gp-evm.
>>
>> Relevant driver side changes are here.
>> http://thread.gmane.org/gmane.linux.kernel.input/35803
>>
>> Please queue this for -next (3.16). Thanks.
> 
> Applying both into omap-for-v3.16/dt thanks.

There has been a change in the DT bindings [1]. i.e. x-size, y-size now become touchscreen-size-x and touchscreen-size-y. I will send a v2 for this series. Please drop these patches and take the v2 instead. Thanks.

cheers,
-roger

[1] - http://article.gmane.org/gmane.linux.kernel/1706454

Re: [PATCH 0/2] ARM: dts: AM43xx: Touchscreen support

[Tony Lindgren]

* Roger Quadros <rogerq@ti.com> [140519 01:47]:
> Hi Tony,
> 
> On 05/06/2014 07:39 PM, Tony Lindgren wrote:
> > * Roger Quadros <rogerq@ti.com> [140430 05:43]:
> >> Hi Benoit & Tony,
> >>
> >> These patches add I2C touch screen support for am43x-epos-evm
> >> and am437x-gp-evm.
> >>
> >> Relevant driver side changes are here.
> >> http://thread.gmane.org/gmane.linux.kernel.input/35803
> >>
> >> Please queue this for -next (3.16). Thanks.
> > 
> > Applying both into omap-for-v3.16/dt thanks.
> 
> There has been a change in the DT bindings [1]. i.e. x-size, y-size now become touchscreen-size-x and touchscreen-size-y. I will send a v2 for this series. Please drop these patches and take the v2 instead. Thanks.

Sorry already pushed out, please send a fix instead
against omap-for-v3.16/dt branch.

Thanks,

Tony