[PATCH v4 0/3] Add Atmel maXTouch support for Peach boards

[PATCH v4 0/3] Add Atmel maXTouch support for Peach boards

[Javier Martinez Canillas]

Hello Kukjin,

This is a fourth version of the series that adds support
for the Atmel trackpad found on the Exynos5420 Peach Pit
and Pi boards.

Support for Pi was included again even when the driver
does not support yet the T100 touchscreen objects used
by the Atmel mXT540S chip found on the Peach Pi, since
Nick Dyer said that he will push the T100 support for
3.18. So we can queue the Peach Pi DTS snippet for 3.18
since by then the driver should already support it.
It was tested on a Peach Pi with an out-of-tree patch
that adds support the needed T100 object support.

The first patch adds the needed changes for the Peach Pit
DTS, the second patch does the same but for the Peach Pi
DTS and the third patch enables the driver in the Exynos
specific kernel configuration.

The patch that enables the driver on the ARMv7 multi-platform
config file was dropped since that is not meant to be merged
through the linux-samsung tree. I'll post a separate series
to sync exynos_defconfig and multi_v7_defconfig so those can
be picked through the arm-soc tree.

This series must be merged after [0] to avoid merge conflicts.

Javier Martinez Canillas (2):
  ARM: dts: Add Peach Pi dts entry for Atmel touchpad
  ARM: exynos_defconfig: Enable Atmel maXTouch support

Sjoerd Simons (1):
  ARM: dts: Add Peach Pit dts entry for Atmel touchpad

 arch/arm/boot/dts/exynos5420-peach-pit.dts | 29 +++++++++++++++++++++++++++++
 arch/arm/boot/dts/exynos5800-peach-pi.dts  | 28 ++++++++++++++++++++++++++++
 arch/arm/configs/exynos_defconfig          |  1 +
 3 files changed, 58 insertions(+)

Best regards,
Javier

[0]: https://lkml.org/lkml/2014/9/10/226

[PATCH v4 1/3] ARM: dts: Add Peach Pit dts entry for Atmel touchpad

[Javier Martinez Canillas]

From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

The Peach Pit board has an Atmel maXTouch trackpad device.
Add the needed Device Tree nodes to support it.

This Device Tree change is based on the Chrome OS 3.8 tree
but adapted to use the mainline Atmel maXTouch DT binding.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---

Changes since v3:
 - Use KEY_RESERVED even for not reserved pins with a GPIO not hooked.
   Suggested by Nick Dyer.
 - Add a comment to specify the maXTouch chip version so is more clear.
   Suggested by Nick Dyer.
 - Omit trailing omit KEY_RESERVED after the GPIO pins. Suggested by Nick Dyer.

Changes since v2:
 - Add spaces around '=' on properties. Suggested by Andreas Faerber.

Changes since v1:
 - Change trackpad IRQ pad function from 0x0 (GPIO input) to 0xf (GPIO IRQ).
   suggested by Tomasz Figa.
 - Remove BTN_TOOL_* from "linux,gpio-keymap" property since those are set
   by input mt core if INPUT_MT_POINTER is set. Suggested by Nick Dyer.
 - Use correct values for "linux,gpio-keymap" property. Suggested by Nick Dyer.
 - Remove support for Peach Pi board since it uses a different Atmel touchpad
   that requires an Atmel object protocol  (T100) not supported by the driver.
 - Use IRQ type constants from <dt-bindings/interrupt-controller/irq.h> instead
   of magic numbers. Suggested by Andreas Faerber.

 arch/arm/boot/dts/exynos5420-peach-pit.dts | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f247709..ad56d4c 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -507,6 +507,28 @@
 	};
 };
 
+&hsi2c_8 {
+	status = "okay";
+	clock-frequency = <333000>;
+
+	/* Atmel mXT336S */
+	trackpad@4b {
+		compatible = "atmel,maxtouch";
+		reg = <0x4b>;
+		interrupt-parent = <&gpx1>;
+		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
+		wakeup-source;
+		pinctrl-names = "default";
+		pinctrl-0 = <&trackpad_irq>;
+		linux,gpio-keymap = <KEY_RESERVED
+				     KEY_RESERVED
+				     KEY_RESERVED	/* GPIO0 */
+				     KEY_RESERVED	/* GPIO1 */
+				     KEY_RESERVED	/* GPIO2 */
+				     BTN_LEFT>; 	/* GPIO3 */
+	};
+};
+
 &hsi2c_9 {
 	status = "okay";
 	clock-frequency = <400000>;
@@ -591,6 +613,13 @@
 		samsung,pin-drv = <0>;
 	};
 
+	trackpad_irq: trackpad-irq {
+		samsung,pins = "gpx1-1";
+		samsung,pin-function = <0xf>;
+		samsung,pin-pud = <0>;
+		samsung,pin-drv = <0>;
+	};
+
 	power_key_irq: power-key-irq {
 		samsung,pins = "gpx1-2";
 		samsung,pin-function = <0>;
-- 
2.1.0

Re: [PATCH v4 1/3] ARM: dts: Add Peach Pit dts entry for Atmel touchpad

[Dmitry Torokhov]

On Wed, Sep 10, 2014 at 01:31:29PM +0200, Javier Martinez Canillas wrote:
> From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> 
> The Peach Pit board has an Atmel maXTouch trackpad device.
> Add the needed Device Tree nodes to support it.
> 
> This Device Tree change is based on the Chrome OS 3.8 tree
> but adapted to use the mainline Atmel maXTouch DT binding.
> 
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>

Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

> ---
> 
> Changes since v3:
>  - Use KEY_RESERVED even for not reserved pins with a GPIO not hooked.
>    Suggested by Nick Dyer.
>  - Add a comment to specify the maXTouch chip version so is more clear.
>    Suggested by Nick Dyer.
>  - Omit trailing omit KEY_RESERVED after the GPIO pins. Suggested by Nick Dyer.
> 
> Changes since v2:
>  - Add spaces around '=' on properties. Suggested by Andreas Faerber.
> 
> Changes since v1:
>  - Change trackpad IRQ pad function from 0x0 (GPIO input) to 0xf (GPIO IRQ).
>    suggested by Tomasz Figa.
>  - Remove BTN_TOOL_* from "linux,gpio-keymap" property since those are set
>    by input mt core if INPUT_MT_POINTER is set. Suggested by Nick Dyer.
>  - Use correct values for "linux,gpio-keymap" property. Suggested by Nick Dyer.
>  - Remove support for Peach Pi board since it uses a different Atmel touchpad
>    that requires an Atmel object protocol  (T100) not supported by the driver.
>  - Use IRQ type constants from <dt-bindings/interrupt-controller/irq.h> instead
>    of magic numbers. Suggested by Andreas Faerber.
> 
>  arch/arm/boot/dts/exynos5420-peach-pit.dts | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
> index f247709..ad56d4c 100644
> --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
> +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
> @@ -507,6 +507,28 @@
>  	};
>  };
>  
> +&hsi2c_8 {
> +	status = "okay";
> +	clock-frequency = <333000>;
> +
> +	/* Atmel mXT336S */
> +	trackpad@4b {
> +		compatible = "atmel,maxtouch";
> +		reg = <0x4b>;
> +		interrupt-parent = <&gpx1>;
> +		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
> +		wakeup-source;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&trackpad_irq>;
> +		linux,gpio-keymap = <KEY_RESERVED
> +				     KEY_RESERVED
> +				     KEY_RESERVED	/* GPIO0 */
> +				     KEY_RESERVED	/* GPIO1 */
> +				     KEY_RESERVED	/* GPIO2 */
> +				     BTN_LEFT>; 	/* GPIO3 */

Seems like a single space sneaked between the semicolon and the tab.
Maybe whoever applies could squash it.

Thanks.

-- 
Dmitry

Re: [PATCH v4 1/3] ARM: dts: Add Peach Pit dts entry for Atmel touchpad

[Javier Martinez Canillas]

Hello Dmitry,

On 09/11/2014 12:25 AM, Dmitry Torokhov wrote:
>>  
>> +&hsi2c_8 {
>> +	status = "okay";
>> +	clock-frequency = <333000>;
>> +
>> +	/* Atmel mXT336S */
>> +	trackpad@4b {
>> +		compatible = "atmel,maxtouch";
>> +		reg = <0x4b>;
>> +		interrupt-parent = <&gpx1>;
>> +		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
>> +		wakeup-source;
>> +		pinctrl-names = "default";
>> +		pinctrl-0 = <&trackpad_irq>;
>> +		linux,gpio-keymap = <KEY_RESERVED
>> +				     KEY_RESERVED
>> +				     KEY_RESERVED	/* GPIO0 */
>> +				     KEY_RESERVED	/* GPIO1 */
>> +				     KEY_RESERVED	/* GPIO2 */
>> +				     BTN_LEFT>; 	/* GPIO3 */
> 
> Seems like a single space sneaked between the semicolon and the tab.
> Maybe whoever applies could squash it.
> 

Right, I set c-default-style to "linux" on Emacs but seems it gets confused
sometimes when editing Device Tree source files. Sorry about that.

Best regards,
Javier

Re: [PATCH v4 1/3] ARM: dts: Add Peach Pit dts entry for Atmel touchpad

[Kukjin Kim]

On 09/11/14 18:44, Javier Martinez Canillas wrote:
> Hello Dmitry,
>
Hi,

> On 09/11/2014 12:25 AM, Dmitry Torokhov wrote:
>>>
>>> +&hsi2c_8 {
>>> +	status = "okay";
>>> +	clock-frequency =<333000>;
>>> +
>>> +	/* Atmel mXT336S */
>>> +	trackpad@4b {
>>> +		compatible = "atmel,maxtouch";
>>> +		reg =<0x4b>;
>>> +		interrupt-parent =<&gpx1>;
>>> +		interrupts =<1 IRQ_TYPE_EDGE_FALLING>;
>>> +		wakeup-source;
>>> +		pinctrl-names = "default";
>>> +		pinctrl-0 =<&trackpad_irq>;
>>> +		linux,gpio-keymap =<KEY_RESERVED
>>> +				     KEY_RESERVED
>>> +				     KEY_RESERVED	/* GPIO0 */
>>> +				     KEY_RESERVED	/* GPIO1 */
>>> +				     KEY_RESERVED	/* GPIO2 */
>>> +				     BTN_LEFT>; 	/* GPIO3 */
>>
>> Seems like a single space sneaked between the semicolon and the tab.
>> Maybe whoever applies could squash it.
>>
>
> Right, I set c-default-style to "linux" on Emacs but seems it gets confused
> sometimes when editing Device Tree source files. Sorry about that.
>
Applied this whole series with fixing a white space Dmitry commented.

Note, I will handle all of exynos_defconfig changes separately.

Thanks,
Kukjin

[PATCH v4 2/3] ARM: dts: Add Peach Pi dts entry for Atmel touchpad

[Javier Martinez Canillas]

The Peach Pi board has an Atmel maXTouch trackpad device.
Add the needed Device Tree nodes to support it.

This Device Tree change is based on the Chrome OS 3.8 tree
but adapted to use the mainline Atmel maXTouch DT binding.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---

Changes since v3: None, new patch.

 arch/arm/boot/dts/exynos5800-peach-pi.dts | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 88b3544..025a095 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -505,6 +505,27 @@
 	};
 };
 
+&hsi2c_8 {
+	status = "okay";
+	clock-frequency = <333000>;
+	/* Atmel mXT540S */
+	trackpad@4b {
+		compatible = "atmel,maxtouch";
+		reg = <0x4b>;
+		interrupt-parent = <&gpx1>;
+		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
+		wakeup-source;
+		pinctrl-names = "default";
+		pinctrl-0 = <&trackpad_irq>;
+		linux,gpio-keymap = <KEY_RESERVED
+				     KEY_RESERVED
+				     KEY_RESERVED	/* GPIO 0 */
+				     KEY_RESERVED	/* GPIO 1 */
+				     BTN_LEFT		/* GPIO 2 */
+				     KEY_RESERVED>;	/* GPIO 3 */
+	};
+};
+
 &hsi2c_9 {
 	status = "okay";
 	clock-frequency = <400000>;
@@ -589,6 +610,13 @@
 		samsung,pin-drv = <0>;
 	};
 
+	trackpad_irq: trackpad-irq {
+		samsung,pins = "gpx1-1";
+		samsung,pin-function = <0xf>;
+		samsung,pin-pud = <0>;
+		samsung,pin-drv = <0>;
+	};
+
 	power_key_irq: power-key-irq {
 		samsung,pins = "gpx1-2";
 		samsung,pin-function = <0>;
-- 
2.1.0

Re: [PATCH v4 2/3] ARM: dts: Add Peach Pi dts entry for Atmel touchpad

[Dmitry Torokhov]

On Wed, Sep 10, 2014 at 01:31:30PM +0200, Javier Martinez Canillas wrote:
> The Peach Pi board has an Atmel maXTouch trackpad device.
> Add the needed Device Tree nodes to support it.
> 
> This Device Tree change is based on the Chrome OS 3.8 tree
> but adapted to use the mainline Atmel maXTouch DT binding.
> 
> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>

This one looks fine to me as well.

Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Thanks.

-- 
Dmitry

[PATCH v4 3/3] ARM: exynos_defconfig: Enable Atmel maXTouch support

[Javier Martinez Canillas]

Many Exynos based Chromebooks have an Atmel trackpad so enable
support for it by default will make easier for users.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---

Changes since v3: None

 arch/arm/configs/exynos_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index fbbac06..f00d0fc 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -60,6 +60,7 @@ CONFIG_KEYBOARD_CROS_EC=y
 # CONFIG_MOUSE_PS2 is not set
 CONFIG_MOUSE_CYAPA=y
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-- 
2.1.0