diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-09-27 09:55:56 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2017-10-02 16:43:55 +0200 |
| commit | 3ea833971feffd21b13b361eeea8981105b5c8ed (patch) | |
| tree | 7800fa01f25de3c6f609089ebf2d984a8458ee34 | |
| parent | 3e11eb11f547b0126128851cf4e3877273cecd0e (diff) | |
ARM: dts: imx6ull-colibri: add atmel mxt multitouch controller
Add atmel mxt multitouch controller driver which is interfaced over I2C bus.
This controller is used by the Logic Technologies, Capacitive Touch Display
7" Parallel (LT161010-2NHC).
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri.dtsi | 18 |
2 files changed, 23 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts index 35c9cfc55597..45fb5e9a96b2 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts @@ -124,6 +124,15 @@ scl-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio5>; + interrupts = <4 IRQ_TYPE_EDGE_FALLING>; + status = "disabled"; + }; + touch: touchrevf0710a@10 { compatible = "touchrevolution,fusion-f0710a"; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index d47de46a35f6..df20525b5a06 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -225,7 +225,7 @@ &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_2 &pinctrl_hog_3 - &pinctrl_hog_4>; + &pinctrl_hog_4 &pinctrl_hog_5>; imx6ull-colibri { pinctrl_hog_1: hoggrp-1 { @@ -242,7 +242,6 @@ MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x14 /* SODIMM 100 */ MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15 0x14 /* SODIMM 102 */ MX6UL_PAD_ENET1_RX_ER__GPIO2_IO07 0x14 /* SODIMM 104 */ - MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0x74 /* SODIMM 106 */ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x14 /* SODIMM 186 */ >; }; @@ -276,6 +275,12 @@ >; }; + pinctrl_hog_5: hoggrp-5 { /* ATMEL MXT TOUCH */ + fsl,pins = < + MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0x74 /* SODIMM 106 */ + >; + }; + pinctrl_can_int: canintgrp { fsl,pins = < MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0X14 /* SODIMM 73 */ @@ -504,7 +509,7 @@ &iomuxc_snvs { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_snvs_hog_1>; + pinctrl-0 = <&pinctrl_snvs_hog_1 &pinctrl_snvs_hog_2>; imx6ull-colibri { pinctrl_snvs_hog_1: snvs-hoggrp-1 { @@ -512,13 +517,18 @@ MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x14 /* SODIMM 93 */ MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x14 /* SODIMM 95 */ MX6ULL_PAD_BOOT_MODE0__GPIO5_IO10 0x74 /* SODIMM 105 */ - MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x74 /* SODIMM 107 */ MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x14 /* SODIMM 127 */ MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x14 /* SODIMM 131 USBH OC */ MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x74 /* SODIMM 138 */ >; }; + pinctrl_snvs_hog_2: snvs-hoggrp-2 { /* ATMEL MXT TOUCH */ + fsl,pins = < + MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x74 /* SODIMM 107 */ + >; + }; + pinctrl_snvs_ad7879_int: snvs-ad7879-int { /* TOUCH Interrupt */ fsl,pins = < MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x1b0b0 |